added release calendar
Merge remote branch 'origin/master'
deleted ebenv configs - moving back to rvm
deleted another .ruby-version file
removed font family - was causing problems in firefox rendering grid lines
Merge branch 'master' of flow-fe01.dev.ewr1.nytimes.com:/opt/git/flow
added indexes to reporting relationship, bumped up memcache ttl value
readme updates
added back rvm support, .rvmrc file in project root
checking in rvmrc
Merge branch 'feature/rvm-support' into develop

* feature/rvm-support:
  checking in rvmrc
  added back rvm support, .rvmrc file in project root
re-added .rvmrc file - something went wrong on first attempt
test readme commit
cleaned up top level documentation structure
cleanup of documentation; added binstubs for httparty, thin; moved thin out of Gemfile dev and test groups, into main section; deleted old docs
Merge branch 'feature/environment-cleanup' into develop. Looks like it's getting squashed by default.

* feature/environment-cleanup:
  cleanup of documentation; added binstubs for httparty, thin; moved thin out of Gemfile dev and test groups, into main section; deleted old docs
  cleaned up top level documentation structure
  test readme commit
test.
Merge branch 'feature/test_branch' into develop

* feature/test_branch:
  test.
updated gemfile lock to update capybara (firefox selenium driver was breaking with new firefox); changed tree retrieval to rely on custom SQL join, pulled out caching and worker thread, added application.rb line to include files from services directory (models and controllers are getting fat)
Merge branch 'develop' of vostok.constantlabs.com:/opt/git/flow into develop

* 'develop' of vostok.constantlabs.com:/opt/git/flow:
  updated gemfile lock to update capybara (firefox selenium driver was breaking with new firefox); changed tree retrieval to rely on custom SQL join, pulled out caching and worker thread, added application.rb line to include files from services directory (models and controllers are getting fat)