Merge branch 'macbook'
remove composer path
update vimrc
Merge branch 'master' into macbook
update