put back the nullable in Proposal columns
clean up
convert all the other fields which needs html repr to MarkdownColumn
fixes for MarkdownComposite
fixes for MarkdownComposite
migrations to use MarkdownComposite
remove db param in MarkdownColumn
Merge branch 'master' into composite-column

Conflicts:
	funnel/models/__init__.py
	funnel/views/__init__.py
Markdown flags are no longer required.
New import location for MarkdownField.
Merge pull request #57 from hasgeek/composite-column

Composite markdown columns.