Merge remote-tracking branch 'origin/master' into hashdist-add_elemental

Conflicts resolved by adding changes from both branches to .travis.yml

Conflicts:
	.travis.yml