Merge branch 'hotfix/git_prompt_fix'
Merge branch 'release/v0.7.1'
ackrc now ignores vendor/bundle