Merge branch 'develop' of https://github.com/brentkuhar/Ghost into develop

Signed-off-by: Brent Kuhar <brent.kuhar@archotype.com>
Merge branch 'develop' of https://github.com/brentkuhar/Ghost into develop