Adding a bunch of changes that I made to the code. I thought a lot of this was
done on my machine but I guess not. Primarily code fixing a lot of terrible
bugs I had previously
Merge branch 'evaluation' of https://github.com/Drin/spam into evaluation