5/19/14 deploy
Merge branch 'master' of github.com:ryanere/cavalier-dist