Merge branch 'master' of https://github.com/Yelp/MOE into norases_354_ucb1_bandit

Conflicts:
	CHANGELOG.md
fixed typo
Merge branch 'norases_354_ucb1_bandit' of https://github.com/Yelp/MOE into norases_354_ucb1_bandit