Remove references to magnific-popup; fix conditional error on settings.jade
style changes to settings page
more css changes to settings
Remove unused scripts from layout.jade
Merge branch 'master' of heroku.com:pure-badlands-4684