use vim instead of gvim for merging
add pam_environment
alias for closing branch