Various updates for Yosemite and new apps, also some rearranging