added Gemfile; updated gems
fixed bug whereby regexes were not being properly matched
merged in master