Image optimization
Image optimization
Merge branch 'master' of https://github.com/eeeschwartz/erikschwartz

Conflicts:
	.gitignore
	images/prose-screenshot.png
	images/vim-screenshot.png
	javascripts/soundmanagerv297a-20130512/demo/animation-2a/cursor-3.cur