some changes to settings page etc
Merge branch 'develop' of https://github.com/Make-Magazine/makerapp into develop

# By Dan P. Gailey
# Via Dan P. Gailey
* 'develop' of https://github.com/Make-Magazine/makerapp:
  adding sub nav comments
  fixing sub nav context
  adding new paths
  changing uri redirect to point to slug