Change ultisnips expand trigger to <c-l>
Add function to view the last N commits in vsplits
Merge branch 'master' of github.com:mattboehm/dotfiles

Conflicts:
	.vimrc