Merge branch 'master' into jfautley-support-ssl

Merge pull request CiscoCloud#5 from CiscoCloud/revert-3-master

Revert "Upgrading consul-template to 0.9.0"

Merge pull request CiscoCloud#1 from CiscoCloud/feature/marathon-consul

pull from Marathon information instead of consul services