(no bug) improve install flow

We still have a test failure from bug 1014799 (which @peterbe is working on) but otherwise this simplifies things in a few places and makes sure that our install steps work. I tested this in a clean vagrant environment.