Cleaned up match-line
Added missing dependencies
Merge branch 'develop' of bouville.local:~/src/fountain-mode into develop

Conflicts:
	fountain-mode.el