Squashed commit of the following:

commit a2ea51e91944631dfc4ecab6a1403a2ec1a114cc
Author: john irving <whimful@gmail.com>
Date:   Sun Mar 30 14:50:10 2014 +1300

    updates