.gitignore
resolving merge conflicts
updates geoserver url in local settings (shouldn't be here)
Merge branch 'deploy' of https://github.com/MAPC/geonode into deploy
Merge branch 'deploy' of https://github.com/MAPC/geonode into deploy
some change to masshealth programs