Git: Add intelliJ files to gitignore
GPG: Add a longer cache for SSH agent
tmux: Disable the re-source shortcut (causing trouble with 1.8)
Prezto: Update to use the gpg plugin
Merge branch 'master' into oucs

Conflicts:
	gitignore