Fix compiler errors
Merge remote-tracking branch 'upstream/master' into upstream-master

Conflicts:
	src/test/java/org/numenta/nupic/unit/encoders/ScalarEncoderTest.java
Corrected pathing in test launchers
Update README.md
Update README.md
Merge remote-tracking branch 'upstream/master' into upstream-master
Merge branch 'upstream-master'