Add dependency for main hikki gem
Merge gemspec updates