Merge remote-tracking branch 'origin' into public
Fix throw to pass linter
Merge pull request #1 from TheAlphaNerd/lint

Fix throw to pass linter
Update Travis with explicit emails
Merge pull request #2 from FamousInternal/travis-email

Update Travis with explicit emails
Merge branch 'public'
Merge remote-tracking branch 'internal/master'