some files didn't get pushed yesterday. hopefully this will fix
Merge branch 'bill' of https://github.com/wcstorey/test into bill