merge
Merge pull request #35 from Swirrl/links

Linked-to/linked-from
bump ver
fix gemspec
Merge remote-tracking branch 'upstream/master'

Conflicts:
	tripod.gemspec