Quality fixes for week of Nov 4, 2013. Closes #821
Merge pull request #825 from vz-risk/issue821

Quality fixes for week of Nov 4, 2013. Closes #821