More setup
Merge branch 'master' of github:StevenEBarbaro/faire
Removed options option from Hapi.server
Merge branch 'master' of github.com:StevenEBarbaro/faire into StevenEBarbaro-master

Conflicts:
	index.js