Break the bootstrap/update pieces apart to allow for as much resuability as possible. Fixed issues related to ubuntu.12.04 install process.