Resolving merge conflcits
streamlined adding 'required' class to form fields
Adjusting berks install path
Updating Berksfile.lock
Merge pull request #8 from TSRI/berks

Berkshelf
Adjusting development and production settings, as wella s removing unneeded static files
resolving merge conflicts