Merge branch 'master' of github.com:garaemon/garaemon-settings
adding travis