fancybox fix
added maker studios
adding oreilly logo
Merge pull request #103 from emkay/oreilly-logo

adding oreilly logo
fixing map link
Merge pull request #104 from emkay/fix-map

fixing map link
removing images folder not being used, and adding new image and link for oreilly
Merge pull request #105 from emkay/fix-oreilly

removing images folder not being used, and adding new image and link for...
adding velocity ny blurb
Merge pull request #106 from emkay/velocity-conf-text

adding velocity ny blurb
Merge remote-tracking branch 'upstream/master' into pastevents
further steps to years breakdown in past events
redo of Davids fancybox fix
Merge branch 'master' into pastevents

Conflicts:
	public/_layout.jade
fancybox?
Starting to add back in old data