Merge branch 'release/2012_04_26-11_18' into develop
Increase time before deleting shows to 6 months
Add an inactive scope for tv_shows
Fix feed updated attribute

Feed updated value may have been a bit random because it wasn't guaranteed to be using an active show that was just updated.
Feed stats

Add a dummy entry at start of the index feed with active/inactive shows/episodes per source.
Merge branch 'feature/feed_stats_for_index' into develop
Cleanup layout
Fix a broken spec and update spec style
Need a destroy_all for some reason, but with a before(:all) its still faster now
Update for the new longer time before deletion
whitespace
Merge branch 'master' into develop
update one more count
move to ruby 1.9.3-p194
Rails -> 3.2.13, add sqlite, update rspec et al too
scrapi was just something being tested
update capybara
Update some development gems
update unicorn
update to machinist 2, lots of spec changes

 - all passing again
 - some hashrocket removal mixed in