Some cleanup
Merge branch 'master' of git@github.com:dwendelen/Thesis.git