Added fix for composer and vimrc
Added vim layouts
Merge branch 'release/1.1.0'