Merge pull request #26 from emkay/master

BEARS COVERED IN PIXI DUST!!!
Set up for haiku, also moves some stuff around
Merge branch 'haikuza' of git://github.com/jxson/nomadaxe.com into jxson-haikuza

Conflicts:
	lib/router.js