Atc update2

Contains commits from 2013-09-13 through 2013-11-07 on oerpub/github-book

The gh-book changes have been removed but for additional context the diff with them included is https://github.com/Connexions/atc/compare/master...1308b8d31bd643a30c2b7bae54180aa4acffe24a