Atc update2

Contains commits from 2013-09-13 through 2013-11-04 on oerpub/github-book