Removed php 5.6 from allowed failures.
Added generate_vcards to gitignore
Merge branch 'master' into propfind-refactor
Some tweaks suggested by @staabm