Some tidy ups and allow manual IP specification rather than auto-detection#1

coling wants to merge 3 commits into

linode:masterlinode/lelastic:masterfrom

coling:mastercoling/lelastic:masterCopy head branch name to clipboard