fixed regex we use to get our IP address so that it works on non-english locales
fixed broken unit tests
Merge pull request #768 from shatterednirvana/ifconfig-on-non-english-locales

Ifconfig on non english locales
fixed broken unit test
renamed test methods to not say xen, since we don't officially support it anymore
Merge pull request #770 from shatterednirvana/fixed-broken-unit-test

properly mocking out if nginx is running
Merge remote-tracking branch: upstream/master