First commit of Rakefile and some vim
Add bashrc and bash_colours
Further split out bash env
Purge that pesky trailing whitespace
Add ripit config
Vim: remove runtimepath definition now I'm using pathogen

Add zshrc
Fix PATH to use /usr/local/bin before /usr/bin
Add zshrc
Install vim-addon-manager hooks
Ignore vim docs/tags
Add global gitconfig file
tabstop change; new modules for VAM; erl-specific settings
Change to my fork of vimerl; add powerline
Add vagrant to omz plugins; turn off that fscking histverify crap
Add powerline to vim
Ignore .netrwhist
Vim: always splitright
Vim: Ignore netrwhist file
Merge branch 'master' of bitbucket.org:sanmiguel/dotfiles
Merge remote-tracking branch 'github/master'

Conflicts:
	.gitignore