rspec conversion in progress
Merge branch 'develop' into rspec
finished conversion of controllers to rspec and massively refactored duplicated test code
changed unit tests to rspec