Use same ctags file for cuda and c++ files
Merge branch 'master' of github.com:mcmaniac/dotfiles

Conflicts:
	vim/vimrc.symlink