Initial commit
Merge branch 'develop'
Added master to travis
Composer in readme