take octal out of the mix and add hex in

Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu>
Merge branch 'master' of https://github.com/dietsche/vim