Production/dev mode changes
Merge branch 'master' of github.com:chrisjbaik/psalted