Consolidate the permissions for Vanilla.Settings.Manage & Vanilla.Categories.Manage into Garden.Settings.Manage.
vBulletin: Remove extra permissions.
Command line tweaks.
Vanilla 1: remove extra permissions.
Merge branch 'master' of github.com:lincolnwebs/VanillaPorter
Add the cdn prefix to the vbulletin porter.
Merge branch 'master' of github.com:lincolnwebs/VanillaPorter

Conflicts:
	class.vbulletin.php
phpbb2: Set the character set of the export.
webwiz: close of the php which is required for the builder.
Close of the php which is required for make.
vBulletin: Fixed incorrect avatar select.
phpbb: Added the UserNote table to the export.
Merge branch 'master' of github.com:lincolnwebs/VanillaPorter