1166703 - builder.py now checks to make sure master isn't checked out.

Building master is still allowed if the --scratch flag is used, or if
you use the new --build-master flag.
Merge pull request #1387 from jeremycline/1166703

1166703 - builder.py now checks to make sure master isn't checked out.