Initial update pass to 2013.11
WIP
Further WIP
Added capabilities and initial storage work
Fixed merge
Fixed merge
Fixed merge