Things die kind of normally
Merge branch 'master' of https://github.com/Bradshaw/octo-hipster