Update .gitignore
Update .gitignore
PM: simplify deploy by relying s3 version of demo page rather than gh-pages
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore
	rakefile