ASSIST-80 - Removed some misguided changes from a few weeks ago.
ASSIST-80 - Handled RSpec3 deprecation warning.
Removed comment clutter from config files. Removed 'will_paginate' gem, which doesn't appear to be getting used anywhere.
Merged changes from master.