Major update, re-organising, optomising etc
Cut down grunt config