make httpcall accepted  `encoding` options
Merge https://github.com/roymax/meteor into peerlibrary
Fixing binary Meteor.http content. See #451
Don't watch public directory for changes. See #894
Merge branch 'issue-894' into peerlibrary
Revert "Don't watch public directory for changes."

It didn't really help because bundler still wanted to bundle
everything at startup.

This reverts commit 97172f547a0cebc4621353e7772ecca26f7305fe.
Merge branch 'master' into peerlibrary

Conflicts:
	packages/http/httpcall_server.js
Added resolve function to Npm.
Merge branch 'npm-resolve' into peerlibrary
Fixed missed require definition.
Merge branch 'npm-resolve' into peerlibrary
Don't display content in errors for binary content.
Merge branch 'master' into peerlibrary
Merge branch 'master' into peerlibrary

Conflicts:
	tools/packages.js
	tools/server/server.js
Fixed missed require definition.
Merge branch 'master' into peerlibrary
Make Meteor.bindEnvironment fail properly when not in fiber.
Merge branch 'master' into peerlibrary
Allow template overriding.
Fixed template overriding.