updated magit & popwin, more chords, todo org-template as an entry for refiling compatibility