More minor changes

I don't think I'm thinking in first person anymore. I really need sleep.
Merge branch 'master' of https://github.com/ncss-2014-group-3/word-by-word