updated data loader
added new parameters to readme
Merge branch 'master' of https://github.com/18F/hourglass

Conflicts:
	.gitignore
Merge pull request #2 from kaitlin/master

Updated data loading, add'l API parameters