Upgrade Gaelyk template for 2.1.0 And some regular housekeeping stuff.