Fix spec
Merge branch 'master' of github.com:allynfolksjr/RailsWinter2013
Fix
remove file that should be untracked