Merge branch 'master' of github.com:mpirnat/dotfiles
Merge branch 'master' of github.com:mpirnat/dotfiles
Merging svn configs (may need to revisit)