Test pull requests too!
Merge branch 'master' of github.com:lloydwatkin/xep-builder

Conflicts:
	travis.yml