Merge pull request #25 from fluxsauce/master

Added support for dashes in machine name, prevent cache clear error if cache not set.
Merge pull request #26 from fluxsauce/master

Suppress errors, if there are no organizations then just return null and don't force a choice.