Reorganizing osx template tree, adding Tim Sutton's new OS X Mavericks definitions