Commit for an unsynced 19/05/2014
Merge branch 'master' of https://github.com/dcleric/playbooks