heat map updates

- added support for reading in from parameter file
- updated heat map code to read in cluster and color variables from
files denoted in parameter file
Merge branch 'master' of https://github.com/danknights/mwas

Conflicts:
	lib/heatmap.mwas.r
heat map updates

added support for reading cluster and color vars from param file