Updating repo as of 6-10-2014

Updating the repo to reflect website updates as of 6-10-2014