Replace method for checking if client is in a vagrant setup. Use
self._settings['controller'] instead of matching running VM names to
the codebase's root folder name.
Merge pull request #503 from tombh/493-vagrant-detection

Replace method for checking if client is in a vagrant setup.