Install vim-eco and vim-easydir
Set up Android SDK
Fix merge