Make things work prettier in Mac OS X
Give executables an extension, to be used with .gitignore
Merge branch 'slave'