Added support for ~/*.skipme files
Merge branch 'master' into apache