Use XFCE 4 terminal by default now.
Use XFCE 4 terminal to prompt for SSH key.
Set Vim as the default editor, duh.
Merge branch 'master' of github.com:aaronbieber/dotfiles
Don't use the simple mode until I have git 1.7.11 everywhere.