Joseph Pollack
adds Neo4j, removes conflict markers
9056f83