Merge branch 'master' into development
bundle gem changes, delayed_job changes
gemfile modifications
dj start / stop modifications

always start/stop dj during a deploy. also stop/start dj for manual
deploy:web:disable/enable
Merge branch 'fix_versions' into development
Merge branch 'validation_tweak' into development