Merge pull request #2 from andyburke/master

Make sure to remove tags from tag list so re-adding will work.
trimming text and formating file
resolving merge conflict
bumping version