ldr listing
s3 caching
nc
switched on jdx options
nc
Merge branch 'master' into jdx_integ

Conflicts:
	Gemfile.lock
	app/models/dataset.rb
	app/uploaders/attachment_uploader.rb
measurement import fix
measurement fix
Merge pull request #2 from awayanyway/jdx_integ

Jdx integ
Merge branch 'master' of https://github.com/Cominch/lsi-rails-prototype
bundle update
Merge branch 'master' of https://github.com/Cominch/lsi-rails-prototype