testing multi-target builds with travis
Merge branch 'master' of github.com:bblough/wfel

Conflicts:
	.travis.yml