Follow-up on review
Merged with master
Implement requested URL changes
Make nginx url matching more strict
Merge branch 'master' of https://github.com/CUL-DigitalServices/avocet-puppet
Nightly script updates

- Enabled google analytics for QA-server
- Disabled local and Twitter authentication
Merge pull request #16 from timdegroote/fix-weird-urls

Make nginx url matching more strict
Follow-up on review, removed Google Analytics from QA
Merge pull request #19 from Coenego/nightly-updates

Nightly updates
Merge remote-tracking branch 'upstream/master'