joshueoconnor/codetest — pull request #2 by JCathead (2014-09-29 12:59:21+00:00)
Title: Final brach request 2

final tranche of suggested edits.