Merge branch 'weak_handle_concept' of git@github.com:cdglove/entity.git into weak_handle_concept

Conflicts:
	.travis.yml
Merge branch 'weak_handle_concept' of git@github.com:cdglove/entity.git into weak_handle_concept

Conflicts:
	.travis.yml