pulled bap_types
library is ready to merge with upstream.
Merge remote-tracking branch 'refs/remotes/upstream/master' into container-review

Conflicts:
	.travis-ci.sh
	README.md
	_oasis
	lib/bap_core/bap_core.ml
	lib/bap_types/.merlin
	lib/bap_types/bap_bitvector.ml
	lib_test/bap_core/run_tests.ml
	lib_test/bap_types/test_bitvector.ml
	lib_test/bap_types/test_conceval.ml
	myocamlbuild.ml.in
	setup.ml.in
Merge pull request #2 from ivg/container-review

Container review