myriad fixes to get neotoma to build
Merge remote-tracking branch 'upstream/master'

Conflicts:
	R/get_download.R
Merge pull request #16 from gavinsimpson/master

Myriad fixes to get neotoma to build & pass checks