Undoing all that idiot's changes
Merge branch 'master' of https://github.com/chezbob/chezbob