A few updates for managing installation.etc.
Removed angular code, cleaned up tests.
Composer.json merge fix