Fix some regex issues

Fixes a couple of problems with the regex matching and variable handling.

1. the expanded regex format consumes whitespace characters so the leading space before the reason-qualifier was disappearing. So to add a reason you had to do `foo++for blah` (no separating space)

2. The remove "@" prefix before names was being too greedy and removing *anything* before an @ symbol, so `foo@bar++` would end up awarding points to 'bar'.

3. The case where only `++` was used was leading to name?.replace returning `Void` which doesn't have a `.trim()` method, so this command function was no longer working.