Update vimrc with new conceals, ctrlp and vim-fireplace
Merge branch 'add-vim-fireplace'

Conflicts:
	_vim/vimrc