bugfixing
Merge branch 'hadoop-reindex' of https://github.com/thinkaurelius/titan into hadoop-reindex

Conflicts:
	titan-hadoop-parent/titan-hadoop-core/src/main/java/com/thinkaurelius/titan/hadoop/formats/titan/TitanGraphOutputMapReduce.java