docker file updates
eol
shell script cleanup
more tweaks for aws
Merge pull request #471 from NICTA/dockerUpdate

docker file updates
Merge branch 'master' of https://github.com/NICTA/nationalmap into wmsWork
fixed param combining
lint
Merge pull request #475 from NICTA/broadbandLeafletFix

fixed param combining
switch geoserver-nm.nicta.com.au
typo
Merge pull request #476 from NICTA/awsGeoserver

Aws geoserver
Merge branch 'wmsWork' of https://github.com/NICTA/nationalmap into wmsWork
merge conflicts