Fix travis CI and misc cmake fixes

Squashed commit of the following:

commit f34df4bbc866e394b40b200aac21c1742bf6f8d0
Author: Kevin Murray <spam@kdmurray.id.au>
Date:   Fri Jul 18 19:54:14 2014 +1000

    Fix output name

commit 9c994bdfb7210c92be39e43424512a1c7aa1b3ec
Author: Kevin Murray <spam@kdmurray.id.au>
Date:   Fri Jul 18 19:50:47 2014 +1000

    attempt 3

commit 75d00cb1acf93d69e59c1ab9e150186bf70beb85
Author: Kevin Murray <spam@kdmurray.id.au>
Date:   Fri Jul 18 19:46:06 2014 +1000

    try 2

commit 743a9f2603975f5611b3c6e3fa54fe030eb95b36
Author: Kevin Murray <spam@kdmurray.id.au>
Date:   Fri Jul 18 19:42:39 2014 +1000

    try 1