Add bundler and some vimrc love
Merge branch 'master' of github.com:kirel/dotfiles

Conflicts:
	vimrc.symlink