bleh not done yet
Merge branch 'master' of https://github.com/Newmu/bearded-bear into messing_around