Got rid of some useless commented out functions.
Merge branch 'master' of github.com:jeid64/drinkshell