Changes for LC-2877

Included a couple of other editorial changes
Merge pull request #58 from awkawk/Working-Branch-for-Q2-2015

Changes for LC-2877 merged per Dec 9 2014 call