Additional cleanup
Merge pull request #2 from aubricus/buzzwords_cleanup

Additional cleanup
Merge branch 'master' into gh-pages