Merge branch 'tp33'
Conflicts:
giraph-gremlin/pom.xml
gremlin-archetype/gremlin-archetype-dsl/pom.xml
gremlin-archetype/gremlin-archetype-server/pom.xml
gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
gremlin-archetype/pom.xml
gremlin-console
Merge branch 'tp33'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5d36ec11
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5d36ec11
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5d36ec11
Br