added properties
cleanup
merged with latest
Merge branch 'master' of https://github.com/simoncomputing/Ghost

Conflicts:
	src/main/java/com/simoncomputing/ghost/generator/RecordGenerator.java
	src/main/java/com/simoncomputing/ghost/hive/HiveData.java
	src/main/java/com/simoncomputing/ghost/hive/HiveDataLoadThread.java
	src/main/java/com/simoncomputing/ghost/hive/HiveRunner.java
	src/main/webapp/WEB-INF/spring/root-context.xml
	src/test/java/GeneratorTest.java
	target/classes/com/simoncomputing/ghost/hive/HiveData$1.class
	target/classes/com/simoncomputing/ghost/hive/HiveData.class
	target/m2e-wtp/web-resources/META-INF/maven/simoncomputing.app/Ghost/pom.properties
not needed anymore