Merge branch 'hotfix/0.0.7.3'
Slight change to accommodate Travis Testing re: dotenv
Merge branch 'hotfix/0.0.7.4' into develop