Add all but default databags and webroots to gitignore
Add port forwarding for MailCatcher
Update documentation with correct ports
Update optional software to an apt-in model
Merge branch 'develop'