renamed some variables.
Merge branch 'master' of https://github.com/rgrannell1/bang
fixed a regular expression issue; word boundaries are now used to end bang flags