Make projectile test file prefix/suffix functions "customizable"
Merge pull request #249 from byels/by-make-test-file-affix-customizable

Make projectile test file prefix/suffix functions "customizable"
Fix failing test
Small docstring fix
Merge remote-tracking branch 'upstream/master'

Conflicts:
	projectile.el