Initial trunk
Merge branch 'master' of https://github.com/hillsborough-hackathon-2013/badDog