branch merge test

testing merge
Merge branch 'master' into macbook
Cleaning up nomenclature, re-adding Bindable setup

Fixing a mix up in the branches

Format fixes only in core.py
Merge pull request #1 from theodox/macbook

Macbook