Merge pull request #605 from mweisman/dev

Use elastic ip for alpha test ami.
Merge branch 'master' of github.com:GeoNode/geonode into dev