Merge pull request #1 from kodawork/develop

Test of Travis build
Merge pull request #2 from kodawork/develop

Update travis build script and s3_website.yml
Merge pull request #5 from kodawork/develop

Issue fixes
Merge pull request #7 from kodawork/master

Fix style issues