Minor changes
Merge branch 'master' of https://github.com/bshillingford/codehackathon2014