Moved the short aliases nearer the top of the file.
Added gca, gss, gsp, gsl, gp
Moved some more aliases nearer the top.
fixed typo
Can now show status of current file in statusline
A couple of Mac-like keybinds
Shortcut to open gnome-terminal
Vim's GUI mode cannot display colour output
Caps Lock key now performs Control
a bunch of changes made for porridge
Git can automatically attempt to rebase instead of doing a merge
Search for similarly named files on <Leader>a
I did not know that
Tabular seems a bit more powerful than Align
minor changes, although they look large
Added 'open_in_current_browser' URL handler
Merge branch 'master' of https://github.com/joeytwiddle/rc_files

Conflicts:
	.vim/plugin/joeykeymap.vim
Noted a bug on Mac OSX where my <Ctrl-J> mapping also gets mapped to <NL>, and fires when holding <CR>, causing issues in Visual mode
We cannot intersperse a multi-line command with shell comments, so changed them to comments in the arguments.
Abstracted out vim_for_git_logs_from_stdin.  This was not actually needed but I kept it because it is more semantic.