update from laptop
Merge branch 'master' of github.com:huashuai/mydotfiles
update bettertouchtool