Add npm twitter
Merge branch 'master' of github.com:diversify/digitaldiamonds
add twitter streaming features
Merge branch 'master' of github.com:diversify/digitaldiamonds

Conflicts:
	.meteor/packages
routes and shop demo