update figures
trying to merge, getting error about scripts/.DS_Store
Merge branch 'master' of https://github.com/ged-lab/2014-mrnaseq-cloud

Conflicts:
	figures/.DS_Store
	scripts/.DS_Store