Merge pull request #9 from wysiwhat/cnx-config-cleanup

Cnx config cleanup
Restructuring SXSW OERPUB example. Fixes #262
fine tune cleanup
remove a <br>
Merge pull request #11 from wysiwhat/sxsw-oerpub-gh-pages-cleanup

SXSW OERPUB gh-pages cleanup
Merge branch 'master' into angularjs-dynamic-content