Cleaning up
Merge branch 'master' of github.com:butlermh/YahooHackDay2013