Lots of Bug fixes in prep for sprint 6 release
Merge branch 'master' of github.com:CBIIT/FHH