Removed stuff that was not being used, rewrote bootstrap to handle two enviroment installations