Adds border= method to set color and width together
Merge
Merge branch 'squidpunch-add-border-combo-method'