Add some dependencies
Merge branch 'thrift' into inotify

Conflicts:
	.gitignore
	pizaid-controller.gemspec