Clean up AWS and Busboy package dependencies
Merge branch 'master' of https://github.com/Face-Off/faceoff
Merge pull request #15 from davegw/master

Configure CORS to allow POST requests
Remove add photo from the Thread create api call /Threads
Add threadId support to the add photo api call /Photos
Merge branch 'master' of https://github.com/Face-Off/faceoff

Conflicts:
	package.json
	server/routes.js
Merge routes from master
Merge pull request #16 from areagray/master

Modify Threads API , relocate photo handling
Changed node env vars
Merge branch 'master' of https://github.com/Face-Off/faceoff
Merge pull request #17 from areagray/master

Modified AWS key vars