Removed functions, fixed pull regex
Merge branch 'master' of github.com:daviddavis/dotfiles