Obligatory
Merge branch 'master' of github.com:isologic/deathstar