Fixed merged conflicts from upstream and removed hashbang in imsg.rb
Removed development_dependency gems which are no longer required
Merge branch 'thor'