Issue #204 - Cleanup includes and modularize more with requirejs and AMD