added (as submodules) NERDTree, vim-bundler, vim-rails and vim-ruby. Updated vimrc with indentation rules.
Merge branch 'master' of https://github.com/edyrhaug/dotvim

Conflicts:
	vimrc
This was very strange indeed.. Looks like I got random lines from
terminal inserted in vimrc?