idk - changes
fun with git stash &
a server without all the stuff in my bashrc
dev0 changes - idk
remove snipmate.vim & solarized
Merge branch 'master' of https://github.com/JKirchartz/dotfiles
merge .gitmodules
update gitignore, vimrc, and a couple vim bundles
gitconfig merge issue (empty line!? OMG!?)
basic gitconfig
try to get everything up-to-date
balete MatchTagAlways
Merge branch 'master' of ssh://github.com/JKirchartz/dotfiles