- Added andrews_and_arnold isp quota config

 - Updated neobundle
 - Cleaned up sonos.lua file
 - A few small modifications to vimrc
Fixed vimrc merge conflict
Merge commit '5a8a385'

Conflicts:
	vim/vimrc