643de15 updating image paths
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	.htaccess
	404.html
	robots.txt
Updated docpad collections
Updated docpad config
Updates
Updated Docpad coffee