More flexibility in button mixin

Issue #160
Merged, conflics fixed
Merge github.com:thoughtbot/bourbon
Merge github.com:thoughtbot/bourbon
Changed to original files
Merge remote-tracking branch 'mendozagioo/master'
Update the flat button mixin to take additional args