Merge branch 'master' of github.com:vallur/banyan.github.com

Conflicts:
	_config.yml