Merge branch 'master' of github.com:slaxor/dotfiles
Merge branch 'linux'
Update vundle
Replace buggy snipmate with xptemplate
Create ~/tmp and ~/bin
Add snapshot script to fetch my live changes
Merge from master