Tagging
Merge branch 'master' into tags

Conflicts:
	lib/capsule_crm.rb
Merge pull request #3 from mattbeedle/tags

Tagging