struggling with pcoa
Merge branch 'master' of github.com:avoorhis/vamps-node.js

Conflicts:
	reports/files/app_js/report.history.js
	reports/files/app_js/report.history.json
	reports/files/config_all_datasets_js/report.history.js
	reports/files/config_all_datasets_js/report.history.json
	reports/files/config_database_dev_js/report.history.js
	reports/files/config_database_dev_js/report.history.json
	reports/files/config_database_test_js/report.history.js
	reports/files/config_database_test_js/report.history.json
	reports/files/config_passport_js/report.history.js
	reports/files/config_passport_js/report.history.json
	reports/files/models_ds_tax_cnt_js/report.history.js
	reports/files/models_ds_tax_cnt_js/report.history.json
	reports/files/models_silva_taxonomy_js/report.history.js
	reports/files/models_silva_taxonomy_js/report.history.json
	reports/files/public_classes_project_dataset_js/report.history.js
	reports/files/public_classes_project_dataset_js/report.history.json
	reports/files/public_constants_js/report.history.js
	reports/files/public_constants_js/report.history.json
	reports/files/public_javascripts_check_form_pg1_js/report.history.js
	reports/files/public_javascripts_check_form_pg1_js/report.history.json
	reports/files/public_javascripts_d3_phylogram_js/report.history.js
	reports/files/public_javascripts_d3_phylogram_js/report.history.json
	reports/files/public_javascripts_global_js/report.history.js
	reports/files/public_javascripts_global_js/report.history.json
	reports/files/public_javascripts_jquery_tipsy_js/report.history.js
	reports/files/public_javascripts_jquery_tipsy_js/report.history.json
	reports/files/public_javascripts_jquery_tooltip_js/report.history.js
	reports/files/public_javascripts_jquery_tooltip_js/report.history.json
	reports/files/public_javascripts_newick_js/report.history.js
	reports/files/public_javascripts_newick_js/report.history.json
	reports/files/public_javascripts_project_dataset_tree_js/report.history.js
	reports/files/public_javascripts_project_dataset_tree_js/report.history.json
	reports/files/public_javascripts_taxonomy_tree_js/report.history.js
	reports/files/public_javascripts_taxonomy_tree_js/report.history.json
	reports/files/public_javascripts_unit_selection_js/report.history.js
	reports/files/public_javascripts_unit_selection_js/report.history.json
	reports/files/routes_datasets_js/report.history.js
	reports/files/routes_datasets_js/report.history.json
	reports/files/routes_helpers_custom_taxa_class_js/report.history.js
	reports/files/routes_helpers_custom_taxa_class_js/report.history.json
	reports/files/routes_helpers_helpers_js/report.history.js
	reports/files/routes_helpers_helpers_js/report.history.json
	reports/files/routes_index_js/report.history.js
	reports/files/routes_index_js/report.history.json
	reports/files/routes_load_all_datasets_js/report.history.js
	reports/files/routes_load_all_datasets_js/report.history.json
	reports/files/routes_projects_js/report.history.js
	reports/files/routes_projects_js/report.history.json
	reports/files/routes_users_js/report.history.js
	reports/files/routes_users_js/report.history.json
	reports/files/routes_visuals_routes_bar_charts_js/report.history.js
	reports/files/routes_visuals_routes_bar_charts_js/report.history.json
	reports/files/routes_visuals_routes_common_js/report.history.js
	reports/files/routes_visuals_routes_common_js/report.history.json
	reports/files/routes_visuals_routes_counts_matrix_js/report.history.js
	reports/files/routes_visuals_routes_counts_matrix_js/report.history.json
	reports/files/routes_visuals_routes_dendrogram_js/report.history.js
	reports/files/routes_visuals_routes_dendrogram_js/report.history.json
	reports/files/routes_visuals_routes_distance_heatmap_js/report.history.js
	reports/files/routes_visuals_routes_distance_heatmap_js/report.history.json
	reports/files/routes_visuals_routes_pie_charts_js/report.history.js
	reports/files/routes_visuals_routes_pie_charts_js/report.history.json
	reports/files/routes_visuals_routes_visualization_js/report.history.js
	reports/files/routes_visuals_routes_visualization_js/report.history.json
	reports/report.history.js
	reports/report.history.json
	reports/report.js
	reports/report.json