upgrade ruby version
Merge branch 'master' of heroku.com:yoyoma
rm ds_store crap