Merge branch 'develop'
don't need that any more, using Eliquent for db creation etc.