update git PS1 for bash
use kdiff3 for git merge
Add gopath and set ulimit -n 1024 by default
remove -a from ackrc