Merge pull request #156 from christianromney/master

Automatically acquire a new etcd discovery token
Only generate new token on vagrant up

Signed-off-by: Christian Romney <cromney@pointslope.com>