Merge remote-tracking branch 'origin/master' into adam-is-awesome
Fix init
Merge pull request #19 from guardian/adam-is-awesome

Adam is awesome