Initial commit
add .vimrc

Add my .vimrc for conference.
Merge branch 'tmp'
Merge branch 'master' of github.com:notee/dotfiles

Conflicts:
	README.md