some additions
Rearchitect project layout
Merge pull request #149 from basho/glossary-updates-jbs

some additions
Merge branch 'master' into gemify-docs-code
gst
Merge branch 'master' into fun-note-jbs
Add jp