CODE REVIEW 2013-12-02 (DO NOT MERGE)

:+1: for having green tests!

Travis CI?