Nebula update

Brings nebula/master up to date with mitchellh/master