Squashed commit of the following:

commit e10e6183325e07c748a674434ff17a8e56350999
Author: Kenrick Turner <kenrickturner@gmail.com>
Date:   Wed Apr 3 14:32:45 2013 +0300

    Google's Titillium is broken; let's use our own