More setup
Merge branch 'master' of github:StevenEBarbaro/faire