added smedia to .gitignore; updated all styles from those in use and linked to them from geoserver
resolved merge conflict by accepting theirs (Gavins)