Removes references to manifest controller from services and routes; #1227
Fixes issue where RVM complains about being out of date
Merges fix for #1203, #1094
Merge branch 'master' into 1227-simplify