Walking through John's changes
Merge remote-tracking branch 'johnBrock/production' into v0.0.2.candidate
Moving tests to new directory
Moving node to new directory
Moving server to new directory
Fixing settings to be 1.6
Updating project file locations and ignores
Merge commit 'cf3db6ad7c3bb44a1ba4dd77ba208ac765d9dabe' into v0.0.2.candidate
Merge commit '395463f1d48d2ca85dd8405d8d42035ef521854b' into v0.0.2.candidate
Hopefully this merges with John

Merge commit '1779dc24a9122b6246a5d0bdce7f4d4ac46be451' into v0.0.2.candidate

Conflicts:
	cacophony/lib/README.txt
	cacophony/src/edu/uci/ics/luci/cacophony/node/Translator.java
	cacophony/src/edu/uci/ics/luci/cacophony/node/TranslatorDouble.java
	cacophony/src/edu/uci/ics/luci/cacophony/node/TranslatorNumeric.java
	cacophony/src/main/java/edu/uci/ics/luci/cacophony/node/TranslatorBoolean.java
	cacophony/src/main/java/edu/uci/ics/luci/cacophony/node/TranslatorDate.java
	cacophony/src/main/java/edu/uci/ics/luci/cacophony/node/TranslatorNumeric.java
	cacophony/src/main/java/edu/uci/ics/luci/cacophony/node/TranslatorString.java
	cacophony/src/main/java/edu/uci/ics/luci/cacophony/node/WekaAttributeTypeValuePair.java
	cacophony/src/test/java/edu/uci/ics/luci/cacophony/node/StringExtractorJSONTest.java
	cacophony/src/test/java/edu/uci/ics/luci/cacophony/node/TranslatorNumericTest.java
Moving code to new place
Fixing overrides