added some more up-to-date info
Merge branch 'master' of github.com:kisonecat/ximera

Conflicts:
	views/about/workshop.markdown