Merge pull request #1 from LawrenceJones/master

Change for deploy
added css and imgs folder, changes jakefiles so they are added to
deployment
Fixed merge conflicts
We
 merg conf