Updated menu
Include .m and .mm for uncrustify
Using the delegate code again with some cleanup
Mac menu support