Removed xptemplate setting.
Converted Bundle commands to use NeoBundle.
Added automatic makeshift_root setting.