[#29] fixes trailing whitespace on names
adds codeship badge to readme
adds code climate badges
cleans up report spec
[#29] fixes name bug, adds tests, and refactors user spec
pulls latest master, fixes merge conflicts