Upgraded to latest rails
Big clean out