General cleanups and improvements
Merge branch 'master' of github.com:beakr/milkshake