Merge pull request #1 from erm/dev

Dev
Merge pull request #2 from erm/dev

removing stuff that isnt ready to remove clutter from the master branch
Merge pull request #3 from erm/dev

Dev
Merge branch 'master' into dev