Make changes for Spring 2014.
Merge pull request #14 from rackerlabs/spring-2014

Make changes for Spring 2014.