Jack edits through 11/6/2014
Merge pull request #1 from bakerjw/master

Jack edits through 11/6/2014