add development branch
cleanin' house!
Squashed commit of the following:

commit 03f4a1a2ddf1110133f784555ebc193588c485dd
Author: Adam Chamberlin <adam@shibbyonline.co.uk>
Date:   Thu Mar 13 09:45:09 2014 +0000

    finally fixed the build process

commit 16e5a142dc3a1433f98000294f98d111b1d50194
Author: Adam Chamberlin <adam@shibbyonline.co.uk>
Date:   Thu Mar 13 09:32:39 2014 +0000

    update Travis CI