A bunch of random fixes
Merge branch 'master' of https://github.com/webgovernor/clickingbad