Removed duplicated line
Fix typo
Merge branch 'niuzhenguo-master' into develop
Fix typo.
Merge branch 'patch-1' of https://github.com/cyberplant/fisa-vim-config into cyberplant-patch-1
Merge branch 'cyberplant-patch-1' into develop
Changelog for version 7.1.2
Merge branch 'changelog-v7.1.2' into develop
Merge branch 'develop'
Merge branch 'master' of https://github.com/zouxifeng/fisa-vim-config into zouxifeng-master
Merge branch 'zouxifeng-master' into develop
Changelog for version 7.1.3
Merge branch 'changelog-v7.1.3' into develop
Merge branch 'develop'
Merge branch 'master' of git://github.com/fisadev/fisa-vim-config

Conflicts:
	README.rst
disabled airline in favor of powerline