some requested addictions.
Merge branch 'master' of https://github.com/samuelmolinski/fuzzy-octo-hipster