Updating phpmyadmin, deploy keys
Merge branch 'master' of github.com:vespakoen/salt-states