Committing this before merging
Merge branch 'perfCPU' of https://github.com/Drin/spam into perfCPU

Conflicts:
	com/drin/java/test/FastSPAMEvaluationCPU.java
Need to commit these before merging into master