Merge branch 'master' of github.com:dukechronicle/chronline into photoshelter
Revert "removed unnecessary addition"

This reverts commit 2f019e4e584f9ac9ce088ea5579431194d38d506.
moved galleries call to after rescue
added nonempty scope and removed super params
removed redundent save call
fixed scope
reset Gemfile.lock
bundle install changes after reset of Gemfile
Upgrade to Ruby 2.1.1.
Fixed bug with discussion board and made it prettier.
Merge branch 'master' of github.com:dukechronicle/chronline into photoshelter
added includes
Added opinion taxonomy terms to Towerview
removed issuu box from articles and towerview
Merge branch 'master' of github.com:dukechronicle/chronline into issuu
towerview special page
Merge branch 'towerview-special'
Merge pull request #156 from dukechronicle/photoshelter

Photoshelter Galleries
Merge branch 'master' into photoshelter-resque