lint and removed dead code
finish conf file tests
Merge branch 'master' of github.com:tsuru/puppet-tsuru