update git editor
Update prompt; add apache shortcuts
Merge branch 'master' of https://www.github.com/johndgiese/config
merge
Merge branch 'master' of https://www.github.com/johndgiese/config
Merge branch 'master' of https://www.github.com/johndgiese/config
backspace on linux
merge