Prep for merge with develop branch
Removed unecessary comment controller functions
Fixed a bunch of rspec problems, 7 left
Fixed all spec issues by deleting comment rspec files
Prep for merge