Button margin
Removed Travis stuff
Merge branch 'master' into spam