Adding fugitive
Remapping ycm up/down completions with j/k from tab/shift-tab
Adding ack and changing header/footer shortcut to <leader>m
Adding pentadactyl
Turning off pentadactyl noinsert and removing the .pentadactyl folder
Disabling : -> ; for searching purposes
Merge remote-tracking branch 'origin/master' into linux

Conflicts:
	.vimrc