CHANGELOG updates.
Update changelog.
Merge remote-tracking branch 'origin/master'

Conflicts:
	CHANGELOG.asciidoc
Optimize imports on gremlin-core.
Add -p option to enable profiling via gremlin.sh
Merge branch 'master' of https://github.com/tinkerpop/tinkerpop3
Add configuration to neo4j to skip tests so that you can get a "fast" build while still getting a good confidence level in test execution. #216
fix typo
Merge pull request #253 from mpollmeier/patch-1

fix typo