Merge branch 'master' of https://github.com/knichol/hangover_helpers.git