Initial commit
Merge with master
Travis build with S3 deploy