fixes aptible/aptible-pages#78
fixes #60
Merge pull request #67 from sandersonet/cleanup

Cleanup