Added couchpenter for uploading couch views
Merge branch 'refs/heads/master' into couch

Conflicts:
	package.json
Multiple changes for CouchDB
Find videos by tags now using Couch
User now using couch