aks: resolved conflicts with original master
aks: fixed bug in original/master parameter replacement; resolved trivial conflicts
aks: changed all file envars to end with _FILE; added git_prompt_reset
aks: addd git_prompt_reset
Merge remote-tracking branch 'original/master'
Merge pull request #72 from aks/master

Added git_prompt_reset
Merge branch 'master' of https://github.com/magicmonty/bash-git-prompt