have spring watch enviroment variable changes
update oj for rails 4.1
removing multijson call in serializejson and setting use_to_json option in oj initializer
use standard json gem
fixing testing issues with using symbols beginning with :test, moving acts as paranoid in user.rb, reloading test routes before use
merging in changes from master
get rid of redundant initializer
re-enabling cache tests
merged
Merge branch 'update_oj'