Add custom snippets for ultisnips
Update
Add new colorscheme: birdsofparadise
Add new plugins
Merge branch 'master' of github.com:TaurusOlson/.vim

Conflicts:
	vimrc