Fix manual finding (fixes #183).
Merge branch 'gitignore' into DF2014
Merge branch 'travis' into DF2014