Merge branch 'cale/rake-bootstrap' into cale/stabilize-dev-env