Changed test case to enforce new behavior on conflicting writes to the index
Added new method to allow index restoration
(wip) implement ES.restore(...) (+ stub for LuceneIndex)
(wip) implement LuceneIndex.restore(...)
add IndexProvider.restore(...) test
fix ES test for competing writes
Merge branch 'titan05' into index05

Conflicts:
	titan-es/src/main/java/com/thinkaurelius/titan/diskstorage/es/ElasticSearchIndex.java
	titan-test/src/main/java/com/thinkaurelius/titan/diskstorage/indexing/IndexProviderTest.java
	titan-test/src/main/java/com/thinkaurelius/titan/graphdb/TitanIndexTest.java
Resolved merge conflicts