change to CTRL-f, as CTRL-[ clashes with escape, making vim a pain to use. CTRL-f chosen as obscure (line feed character)
merged from lathonez
sentry
aws
aws
Merge remote-tracking branch 'upstream/master'