Merge branch 'master' of github.com:shower/shower into keynote
Merge branch 'keynote' of github.com:pepelsbey/shower into keynote