Upgrade to nan@1.2.0
Fix building under node 0.11.13.
Prepare 1.5.0 release
Prepare 1.5.1 release
Prepare 1.5.2 release
Prepare 2.0.0 release
Merge branch 'master' into chrome35

Conflicts:
	package.json
2.1.0
Merge pull request #33 from atom/chrome35

Upgrade to nan@1.2.0