turning off EE for production site for the moment
empty commit
removed duplicate wygwam files
Merge branch 'master' into staging
fixing weird merge issue with staging
Merge branch 'master' of heroku.com:peterarnell-staging into staging