Add 'forget' alias
Move syntastic settings to .vimrc.before
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitconfig
Add common mergetool settings