spring cleaning
changes in light of @tsantero comments
changes for merge
Merge pull request #924 from basho/bugs/lp/revamp-glossary

(boom)