start on setting the environments
Merge branch 'master' into environment
start on template for settings
got rudimentary environment settings working
Merge branch 'environment'