Functional changes & added syntax.
Merge branch 'master' of github.com:cbodden/dotfiles
Syntax changes. Added functions. Goodness.