Lots of little fixes to toolbar and things
Merge branch 'master' of http://github.com/eakellogg/HashFortune