Added all the things
Merge branch 'master' of https://github.com/horak/shove