Adding vim-behat plugin
Upgrading Pathogen from 1.2 to 2.2
Replacing snipmate with neosnippet.
Adding php complete.
Adding php-getter-setter
Adding php-namepsace plugin
Replacing taglist with tagbar
Updated configuration for Syntastic plugin
Removing NerdCommenter plugin.
Merge branch 'master' of github.com:jcarouth/vimrc

Conflicts:
	.gitmodules