General pull request for addition of AQ, changes to HS, and one change to CalculateAll.R

Ben:  Most of these are just general additions to calculate AQ/HS scores.  

But, will you check on the one change made to the CalculateAll.R file?