moved css and js inclusion from atlas.json directly to layout.html

This moves the css and js inclusions into the layout.html file, rather than in atlas.json.  Otherwise, you have to remember to go into atlas.json and add stuff, and I think the average user will get confused by this.  The more it can just work out of the box the better.