Merge pull request #96 from jonschlinkert/master

get travis badge working again
Merge pull request #97 from jonschlinkert/master

new "relative" helper for resolving paths
adding ability to read json or yaml data files
adding example for different data file types
Merge remote-tracking branch 'refs/remotes/assemble/master'

Conflicts:
	Gruntfile.js
Merge remote-tracking branch 'refs/remotes/assemble/master'