Aggregate update 5/14/14

Updating codebase on git