Require confi.yml when in development
Removed config.yml test in development
Merge branch 'master' into development
Merge branch 'master' into development
Update analytics tracking
Added npm version package
Added newrelic
Merge branch 'development'

Conflicts:
	views/layout.html