adding config options and new two way bindings
Merge branch 'gh-pages'