revisions enabling cleaner graph output
updates to metrics parsing daemon, as well as a cleanup to plotting JS
fixes for the metric generation process
updates and fixes, to ensure it can run on windows, and from either rails or from the bin directory
Merge branch 'Deploy' into for_reviewers
fixing uplc plots
activating JSON txt, and minification of resources in production
updates and fixes, working on UPLC graphing JS code
updates and fixes for UPLC plotting in both comparison and MSRUN SHOW
Merge branch 'for_reviewers' of https://www.github.com/princelab/metriculator into for_reviewers
working with ruby 2.0.0-p247
fixes for upgrading rails
fixes for upgrading rails
Merge branch 'for_reviewers' of github.com:princelab/metriculator into for_reviewers

Conflicts:
	Gemfile
	app/assets/stylesheets/application.css
	app/assets/stylesheets/custom.css
updates and fixes... seems to load the proper css now
updates and fixes to asset pipeline
updates to legend box formatting
testing if science.js libraries are necessary
fixes to model loading for Comparison generation
adding a landing page for people from the paper