Fixed the mailcatcher port
Added some Require to make sure the tasks are executed in the correct
order.
Merge branch 'EricHogue-mailcatcher' into mailcatcher