Updating plugins
Resolving conflicts
Adding bufexplorer
Resolving some conflicts
Addind phpcs to syntastic
Merge pull request #2 from arthurprogramming/development

Development