Move secrets into an untracked environment settings file
reorganize config folder
reorganize config folder

Conflicts:
	.gitignore
	Gruntfile.js
	server/api/user/index.js
	server/components/access/access.js
	server/config/env/all.js
	server/config/env/development.js
	server/config/env/production.js
	server/config/env/test.js
	server/config/helpers/sample_data.js
	server/express.js
Cleanup express configuration
Consistent style
Removed no cache script middleware
Update comment style
change order of env tasks
Merge branch 'master' into passport

Conflicts:
	.gitignore
	server/api/thing/thing.controller.js
	server/app.js
	server/config/helpers/sample_data.js
	server/config/index.js
	server/express.js