Use d.image=gmacario/baseimage:0.9.15

Signed-off-by: Gianpaolo Macario <gmacario@gmail.com>
Update to CONFLUENCE_BACKUP=backup-2014_07_30.zip

Signed-off-by: Gianpaolo Macario <gmacario@gmail.com>
Merge branch 'master' of github.com:gmacario/vagrant-atlassian