Undo the swap of ; and : for now
Set up map of C-n to suit unswapped : and ;
Remove a load of shortcuts I defined and never used.  Will use snippets in future I think.