Merge pull request #58 from danw/builddir

Stop using bootstrap.bash -b for separate builddir