Merge pull request #204 from jplock/jp-2fa-webmail

Add a 2FA plugin for Roundcube (fixes #201)
Merge pull request #205 from jplock/jp-fix-2fa-vagrant

Skip the google authenticator generation if we're running as vagrant
Merge branch 'master' of https://github.com/al3x/sovereign