Fixes #21
Wrap up issues from phone call
All items in place for review
Merge branch 'development' of github.com:alnutile/cms into development