standardize includes and versions, etc.
cleaning up and making adjustments for berks'd version in chef server.
Merge pull request #2 from gregpalmier/master

make preps for berkshelf version in chef server