update
update
Merge branch 'master' into work

Conflicts:
	.gitignore
	.travis.yml
update
update
Almost there! Bump to version 2.0.beta