Add git-conflict vim aliases
Remove 'enter' key binding in favor of better use of 'q:'
Add nicer syntastic symbols and deactivate vim theme