in face.expressInterest, call face.expressInterestWithClosure with interest as the template argument to correctly apply timeout
Face: Change expressInterestWithClosure to take the interest, not name and template. In expressInterest, if called with a closure, create the interest from the name and template before calling expressInterestWithClosure. Refs #1549.
Merge branch 'issue/1549-expressInterest-overwrites-interestLifetime'. Refs #1549.
http://redmine.named-data.net/issues/1549
Merge branch 'master' of github.com:rynomad/ndn-js into npm

Conflicts:
	js/face.js
Merge branch 'master' of https://github.com/named-data/ndn-js into npm

Conflicts:
	js/face.js
encoding: In DataUtils, added DataUtils.toNumbersIfString.
crypto: When using require("crypto"), use DataUtils.toNumbersIfString to convert in case the returned buffer is a string.
browserify: In Buffer.toString, allow encoding == 'binary'.
Fix bug in DataUtils.toString: Need to call Buffer.toString('binary') to work correctly in Node.
Data (internal): In verify, determine if it is an old version of crypto where verify requires a string signature.
Merge https://github.com/named-data/ndn-js into npm

Conflicts:
	build/ndn.js
	js/data.js
	js/encoding/data-utils.js
	js/face.js
	js/key.js