Version 1.2
Doc rename
Merge branch 'master' of github.com:RiotGames/berkshelf-vagrant

Conflicts:
	CHANGELOG.md
More 1.2 changelogs
testing against 1.2.1 seems good so far
Merge branch 'master' of github.com:RiotGames/vagrant-berkshelf