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
Merge pull request #37 from emkay/master

Merging in @jxson haiku change