bug fixes for beta
Merge branch 'sandbox-jm' of https://github.com/CSTARS/ckanext-esis into sandbox-jm
Merge branch 'master' into sandbox-jm