Update to 1.1.4
Merge branch 'master' of github.com:brentjanderson/meteor-buzz

Conflicts:
	smart.json
	smart.lock