Fix and tidy up the OS X app

Redone pull request #613 for rauix to be cleaner. Does not include
spaces-to-tabs or other formatting changes that #613 had.

Also
 * Updated to latest head (to have a clean merge)
 * Does not include putting configuation out of ```<executions><execution>```