added sidekiq and odocuconv, using both to convert ppt to swf in background
added test
modified travis settings
trying another travis ci conf
Merge branch 'master' of github.com:mindpin/eshare into kaid/odocuconv

Conflicts:
	Gemfile