Misc addition of preferences and stuff
Merge branch 'master' of https://github.com/andrewjpiro/Official-Beowulf-Code