Merge dev-master into master
Merge dev-master into master
Merge dev-master into master
Travis config to run on all branches except master.

I think if this is set and we keep the number of branches low, anyone else will have travis automatically ready to run against their forks. They'll just have to enable the github travis service hook and it will be pre-configured.
Merge remote-tracking branch 'origin' into dev-master