[travis] fix up coveralls

Squashed commit of the following:

commit 85223c547587ac57efbcbbb629720929c889214c
Author: Kevin Murray <spam@kdmurray.id.au>
Date:   Wed Jun 4 22:00:16 2014 +1000

    [travis] restore travis after fixes to coveralls

commit ed7ac91b8cf9a6844e3233f743ca3c1f4f10636c
Author: Kevin Murray <spam@kdmurray.id.au>
Date:   Wed Jun 4 21:47:50 2014 +1000

    think we got it now

commit e350432eaa527962aafc05192acafe960e88720a
Author: Kevin Murray <spam@kdmurray.id.au>
Date:   Wed Jun 4 21:20:54 2014 +1000

    doh

commit 5ca750565b8462437b0b9f6701c753016ff14bc7
Author: Kevin Murray <spam@kdmurray.id.au>
Date:   Wed Jun 4 21:18:17 2014 +1000

    think i've got it!

commit 64af655ecbe03686c287aa8d310b3ae884ce2f0d
Author: Kevin Murray <spam@kdmurray.id.au>
Date:   Wed Jun 4 21:13:16 2014 +1000

    6

commit da8101f99179960a599f541b9ec75b44bdc0a154
Author: Kevin Murray <spam@kdmurray.id.au>
Date:   Wed Jun 4 21:10:25 2014 +1000

    5

commit c49b4d9553bee32486e7cdba7d67226521f05bc6
Author: Kevin Murray <spam@kdmurray.id.au>
Date:   Wed Jun 4 21:07:44 2014 +1000

    4

commit 334fde9a41ff230c56db1fb6689241a5738508f5
Author: Kevin Murray <spam@kdmurray.id.au>
Date:   Wed Jun 4 20:18:41 2014 +1000

    3

commit c11847794388eb8189d11987ad5df915c32ec656
Author: Kevin Murray <spam@kdmurray.id.au>
Date:   Wed Jun 4 20:15:02 2014 +1000

    speed up builds temporarily

commit cdef515eaae87b30bcfe1b73f737a5ffae26502a
Author: Kevin Murray <spam@kdmurray.id.au>
Date:   Wed Jun 4 20:14:06 2014 +1000

    attempt 2

commit 615d4cdccde4553e47477545618f080d45de8a0a
Author: Kevin Murray <spam@kdmurray.id.au>
Date:   Wed Jun 4 20:08:39 2014 +1000

    try fixing coveralls again

commit 8c058de957a7a5710bb17a6a503a0b0db59b697e
Merge: 7eb332f ecc4bd6
Author: Kevin Murray <spam@kdmurray.id.au>
Date:   Wed Jun 4 20:08:04 2014 +1000

    Merge branch 'dev' into fixcoveralls

commit 7eb332f9a7485440cd209a26489565cc154ba0a4
Author: Kevin Murray <spam@kdmurray.id.au>
Date:   Sun Jun 1 13:23:21 2014 +1000

    [travis] try fixing coveralls