Merge Summer 2013 CAN Edits into DP Branches

Merge updates from CAN developed over summer 2013 to the DP instance.