Upgrade to nan@1.2.0
Prepare 1.1.0 release
Prepare 2.0.0 release
Merge branch 'master' into chrome35

Conflicts:
	package.json
Prepare 2.0.1 release
Merge pull request #8 from atom/chrome35

Upgrade to nan@1.2.0