Removing option tree
Merge branch 'develop' of github.com:twg/TEDxTheme into feature/cleanup
Merge pull request #10 from twg/feature/cleanup

Removing option tree
bringing in sync with develop