colin fixes to server side of amres
gjdss

erge branch 'master' of github.com:mackm/htdocs