Merge branch 'origin/bootstrap'
Clean up order
Moved jangular
Merge pull request #6 from entermedia-community/dev

Commits merged from derv to complete jAngular move and other edits