Client prep #1

#### Changes made under client meeting prep 2014-04-01. 

See commit messages for details.