# Conflicts:
#	.circleci/config.yml
#	.circleci/images/Dockerfile
#	.travis.yml
#	Dockerfile
#	MANIFEST.in
#	Makefile
#	README.md
#	VERSION
#	doc/docs_require.txt
#	doc/source/notebooks/advanced/gps_for_big_data.ipynb
#	doc/source/notebooks/advanced/kernels.ipynb
#	doc/source/notebooks/advanced/mcmc.ipynb
#	doc/source/notebooks/advanced/monitoring.ipynb
#	doc/source/notebooks/advanced/multioutput.ipynb
#	doc/source/notebooks/advanced/natural_gradients.ipynb
#	doc/source/notebooks/advanced/new_multioutput_gp_features.png
#	doc/source/notebooks/advanced/new_multioutput_gp_kernels.png
#	doc/source/notebooks/advanced/optimisation.ipynb
#	doc/source/notebooks/advanced/settings.ipynb
#	doc/source/notebooks/basics/GPLVM.ipynb
#	doc/source/notebooks/basics/classification.ipynb
#	doc/source/notebooks/basics/regression.ipynb
#	doc/source/notebooks/intro.ipynb
#	doc/source/notebooks/tailor/kernel_design.ipynb
#	doc/source/notebooks/theory/FITCvsVFE.py
#	doc/source/notebooks/theory/SGPR_notes.ipynb
#	doc/source/notebooks/theory/data/snelson_test_inputs.dat
#	doc/source/notebooks/theory/data/snelson_train_inputs.dat
#	doc/source/notebooks/theory/data/snelson_train_outputs.dat
#	doc/source/notebooks/theory/upper_bound.ipynb
#	doc/source/notebooks/theory/vgp_notes.ipynb
#	doc/source/notebooks/tips_and_tricks.ipynb
#	doc/source/notebooks/understanding/models.ipynb
#	doc/source/notebooks/understanding/tf_graphs_and_sessions.ipynb
#	gpflow/_settings.py
#	gpflow/_version.py
#	gpflow/conditionals.py
#	gpflow/core/compilable.py
#	gpflow/core/parentable.py
#	gpflow/expectations.py
#	gpflow/features.py
#	gpflow/gpflowrc
#	gpflow/kernels.py
#	gpflow/kullback_leiblers.py
#	gpflow/likelihoods/likelihoods.py
#	gpflow/logdensities.py
#	gpflow/mean_functions.py
#	gpflow/misc.py
#	gpflow/models/gplvm.py
#	gpflow/models/gpmc.py
#	gpflow/models/gpr.py
#	gpflow/models/model.py
#	gpflow/models/sgpr.py
#	gpflow/models/svgp.py
#	gpflow/models/vgp.py
#	gpflow/multioutput/conditionals.py
#	gpflow/multioutput/features.py
#	gpflow/params/parameter.py
#	gpflow/params/parameterized.py
#	gpflow/params/paramlist.py
#	gpflow/priors.py
#	gpflow/saver/saver.py
#	gpflow/saver/serializers.py
#	gpflow/test_util.py
#	gpflow/training/external_optimizer.py
#	gpflow/training/monitor.py
#	gpflow/training/scipy_optimizer.py
#	gpflow/training/tensorflow_optimizer.py
#	gpflow/transforms.py
#	setup.py
#	tests/__init__.py
#	tests/test_conditionals.py
#	tests/test_config.py
#	tests/test_expectations.py
#	tests/test_features.py
#	tests/test_kerns.py
#	tests/test_kldiv.py
#	tests/test_likelihoods.py
#	tests/test_logdensities.py
#	tests/test_methods.py
#	tests/test_misc.py
#	tests/test_monitor.py
#	tests/test_multioutput.py
#	tests/test_optimizers.py
#	tests/test_param.py
#	tests/test_saver.py
#	tests/test_transforms.py