JUnit to work with eclim
Merge branch 'master' of https://github.com/capitancambio/dotfiles
minor changes on the .vimrc file
Merge branch 'master' of https://github.com/capitancambio/dotfiles

Conflicts:
	.vimrc
Update vimrc changes
Merge branch 'master' of https://github.com/capitancambio/dotfiles

Conflicts:
	.vimrc