Merge branch 'master' of github.com:rymurr/Ghost
Merge branch 'master' into cortney