Pull 9/13/14

Pulling Kayla's updates