committing latest. not really sure what I've done here.
Merge branch 'master' of github.com:wfreeman/neo4j-memory-inserter

Conflicts:
	src/import.c
fixing gitignore