Merge pull request #4 from seattle-biomed/upstream

Make bootstrap-joyent executable.
Don't assume DHCP is always on (e.g. Rackspace instances).
Merge remote-tracking branch 'upstream/master' into upstream