Merge branch '2014-08-04-Davidson' of github.com:njvack/boot-camps into 2014-08-04-Davidson