package.exs
Merge branch 'master' of https://github.com/nirvana/couchie
Update .gitignore
Merge branch 'master' of https://github.com/nirvana/couchie

Conflicts:
	.gitignore
Fixed incompatiblity with Couchie.Transcoder and Jazz.