Merge pull request #135 from palbee/develop

Rearranged the installation instruction so that the the Linux and Mac se...
[skip ci]
changed instances of `__add__` to `__or__` -- closes #133
#134