Pull CAN Summer 2013 Updates into uwdp-develop

Merges updates developed over summer 2013 for CAN into the DP deploy branch.