Update augroups for filetypes

Signed-off-by: Michael Barton <mail@michaelbarton.me.uk>
Rebind k and j for motion

Signed-off-by: Michael Barton <mail@michaelbarton.me.uk>