Merge tag '2.0' into develop

2.0
production config updated
sleep a bit longer to allow services to start
send confirmation emails to existing users with unverified accounts
bump to 2.0.1
Merge branch 'release/2.0.1'