who the frick added the .orig files to the git? Don't we have a gitignore or something
Merge branch 'master' of https://github.com/Bradshaw/octo-hipster