html to markdown occurs locally
added travis badge for cfa
upgrade to safer nokogiri
upgrade to safer rails patch (> 3.2.17)
added inch gem
Merge pull request #33 from adelevie/feature/cfa_upgrade_gems_for_security

Feature/cfa upgrade gems for security
Merge pull request #48 from adelevie/feature/inch

added inch gem
Merge pull request #30 from adelevie/feature/add_cfa_travis_badge

added travis badge for cfa
inch badge
Merge pull request #50 from adelevie/feature/inch_badge

inch badge
Merge branch 'feature/local_markdownifier_clean'

Conflicts:
	Gemfile.lock

This was conflicted due to a new Rails version not being included in a previous commit. Adding that along with these changes
Fixes issue with category and guides

Guides were not displaying because of a missing ‘,’ in the meta tag
information in the guides view. Added a helper to generate the meta_tag
options

Also fixed and issue where the categories were not linking to the
correct article urls.

Gave the category factory a more proper title using Faker.