more crap

Signed-off-by: Scott Bauer <sbauer@eng.utah.edu>
 Merge branch 'master' of https://github.com/spall/advalg
 Merge branch 'master' of https://github.com/spall/advalg
merged, fixed, etc

Signed-off-by: Scott Bauer <sbauer@eng.utah.edu>