Git does not track empty directories
Test failure modes as well
Merge branch 'master' into travis