Fixed Chris' issues
Merge branch 'master' of https://github.com/marcusmyers/involve