Add maildown gem
Merge branch 'master' into maildown

Resolve conflict between removing figaro and adding maildown

Conflicts:
	Gemfile