Refactor boot methods redux

Rebased #231, hopefully Travis picks it up now.