PR for minor updates

This PR contains a change to Josh's great work for the build scripts and my previous work for the bundle activator.  Things are loading again, good stuff!