created ChannelService
Merge branch 'master' of https://github.com/ztstewart/BitVid into ztstewart-master

Conflicts:
	main/views.py
Complain if AWS credentials are missing
fixed missing comma, resultet in allways empty aws creds.
seperated channels from main app
Merge branch 'master' of github.com:theCatsPaw/BitVid

Conflicts:
	main/views.py
draft of the search using haystack+elasticsearch

You need to install a local elasticsearch node (elasticsearch.com) and
start it using the default properties. in the app's directory run
manage.py rebuild_index to initialize the index and you should be ready to
go. Try by creating a channel and searching for it (no search box, goto
/search/)
fixed requirements. Added search info to readme
Merge branch 'master' into HEAD

Conflicts:
	bitvid/urls.py
	main/models.py
	main/views.py
Merge pull request #3 from theCatsPaw/master

Search, seperating Channels into own app