A little background work
Merge branch 'master' into gh-pages

Conflicts:
	.DS_Store