Rename :+ to +, and :- to -

* Refs #7
Merge pull request #9 from patriknw/wip-7-rename-plus-minus-patriknw

Rename :+ to +, and :- to -