fix for data cannot split onto 2 lines
test for function, not as a string
add test for map
handle relative fixtures correctly
Merge branch 'master' into mocha

Conflicts:
	lib/skelgen.js
	test/skelgen.js