MERGED Gabe & Takumi Task Branch 6/5/13

This is the MERGED Gabe & Takumi Task Branch 6/5/13
/commit/c59646b512228d36790337c4c827455925221b27 Gabe's
/commit/c09dff77c95ef848a8561b3c511b6ab6b97bc816 Takumi's