Added git/hg branch to terminal prompt
Move scm info to own thing. Added cilk++ support.