update
Merge branch 'master' of https://github.com/windflyer/vim_conf
update smali highlighter