Fix travis tests
Fix test errors
Add marvin to travis notification
If there's a memcached.yml, use it
Merge branch 'master' of github.com:thelabtech/missionhub
Add therubyracer
Allow admin to copy survey to another organization
Fix conflicts