Cleaning up the MWC2013 branch to only have what is/was actually worked
on for MWC2013