Merge branch 'london_hackathon' of https://github.com/thehyve/transmart-data into london_hackathon
Merge branch 'london_hackathon' of https://github.com/transmart/transmart-data into london_hackathon
Merge branch 'london_hackathon' of https://github.com/transmart/transmart-data into london_hackathon
Merge branch 'london_hackathon' of https://github.com/transmart/transmart-data into london_hackathon
Merge branch 'london_hackathon' of https://github.com/transmart/transmart-data into london_hackathon
Configurable DB user passwords
Rename vars-ubuntu to standard vars
Add dependencies on vars file

when a generated file depends on the values of environment variables.
Merge pull request #28 from thehyve/configurable_user_pwds

Configurable DB user passwords
vars.sample: add export to passwords
Fix wrong R rpath when LIBnn=lib64

Done this by forcing LIBnn=lib
Merge branch thehyve/master into thehyve/london_hackathon

Conflicts:
	solr/data-config/oracle/data-config_sanofi.xml.php
	solr/data-config/postgres/data-config_rwg.xml.php
	solr/data-config/postgres/data-config_sample.xml.php
	vars.sample
Support diff biomart_user password in solr/rwg
ws
Merge thehyve/london_hackathon into transmart/london_hackaton
Merge branch 'london_hackathon' of https://github.com/transmart/transmart-data into london_hackathon
Merge branch 'london_hackathon' of https://github.com/transmart/transmart-data into london_hackathon
Missing newline for all passwords
Missing newline for all passwords (cherry-pick)

Cherry-pick from london_hackathon branch.
Fix missing LF chars in pg/gen_kettle_properties