[Fix #724] Unquote variable

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
fixing bad merge, changing prompt
Added dynamic shell header. Fixed merge leftovers
Merge branch 'master' of github.com:sorin-ionescu/prezto