Add the webserver and dbserver bits
Update .gitignore
Merge branch 'deployment'