bringing up to master
Merge branch 'master' of https://github.com/jjin082693/dotfiles
resolve conflict
add font size change support (requires plugin)
more font size stuff