Merge pull request #29 from kartoza/master

added sql for new observations parameters and versioning current observa...
added smedia to .gitignore; updated all styles from those in use and linked to them from geoserver
resolved merge conflict by accepting theirs (Gavins)