Redo parameter initialization for CategoryEncoderTest
Redo parameter initialization for ScalarEncoderTest
changed SpatialPooler and TemporalMemory tests
Merge branch 'master' into switchToNewParamUse
Total conversion of encoder initialization to Builder Pattern
Merge pull request #100 from cogmission/redoParamInit

Redo param init
Merge pull request #101 from cogmission/switchToNewParamUse

changed SpatialPooler and TemporalMemory tests
Merge pull request #103 from cogmission/builderPatternUsage

Builder pattern usage
regen'd javadocs and changed SpatialPooler Parameters init to new method
Merge pull request #104 from cogmission/master

regen'd javadocs and changed SpatialPooler Parameters init to new method
Merge branch 'upstream-master' into parameters-finalized

Conflicts:
	src/main/java/org/numenta/nupic/Parameters.java
	src/test/java/org/numenta/nupic/integration/AbstractTemporalMemoryTest.java
	src/test/java/org/numenta/nupic/integration/BasicTemporalMemoryTest.java
	src/test/java/org/numenta/nupic/integration/ExtensiveTemporalMemoryTest.java
	src/test/java/org/numenta/nupic/unit/encoders/CategoryEncoderTest.java
	src/test/java/org/numenta/nupic/unit/encoders/ScalarEncoderTest.java
	src/test/java/org/numenta/nupic/unit/research/SpatialPoolerTest.java