Add colour for margins and wraps
Merge branch 'master' of github.com:jacobbednarz/atom-bone-a-kite