Merge pull request #5 from theodi/feature-add-subtitle-to-field-list

Add subtitle to field list
Add odidown gem
Merge pull request #6 from theodi/feature-odidown

Use odidown for more markdown extensions
update odidown version
ignore config
Merge branch 'refs/heads/master' into asset-manager

Conflicts:
	Gemfile.lock