Merge in version 0.9.4

commit aff5ce0a592f8bf9170879053cefc9e5a9077943
Author: Ben Osman <dev@smoothify.com>
Date:   Wed Dec 10 02:52:15 2014 +0000

    Remove obsolete patch.

commit a57871cae78184be6519f381298a326f9b63a44f
Author: Ben Osman <dev@smoothify.com>
Date:   Wed Dec 10 02:29:53 2014 +0000

    Updated to version 0.9.4

commit 1c37129fb4bd0836d0988a59e827a8e3e172091a
Merge: e3d6183 b886b00
Author: Ben Osman <dev@smoothify.com>
Date:   Wed Dec 10 02:28:50 2014 +0000

    Merge tag 'upstream/0.9.4'

    * tag 'upstream/0.9.4':
      Add upstream version 0.9.4

commit e3d6183e0e052ab8136bc744578a6c65348ccf7e
Author: Ben Osman <dev@smoothify.com>
Date:   Wed Dec 10 02:28:33 2014 +0000

    Remove old version.

commit b886b00797268ffae791701b44be9be07c2621b7
Author: Ben Osman <dev@smoothify.com>
Date:   Wed Dec 10 02:26:40 2014 +0000

    Add upstream version 0.9.4