moved stuff to dev-assets, and did some experimenting, need to clean stylesheets and javscripts, need to add clean to grunt takss
made watch files better