move changes from page.js to index.js, rebuild
Merge branch 'master' into move-updates

Conflicts:
	page.js
Merge pull request #133 from visionmedia/move-updates

move changes from page.js to index.js, rebuild