some chores
Merge branch 'master' of https://github.com/tan-yuki/myHome
chores
Merge branch 'master' of https://github.com/tan-yuki/myHome

Conflicts:
	.vimrc
add powerline