Merge pull request #23 from kkoopa/master

Updated NAN to 0.3.0.
travis: Allow node 0.11 to fail
2.1.0
package.json: update NAN to ~0.4.0
2.1.1
Merge branch 'master' into snappy1.1.1

Conflicts:
	package.json