Border-box ftw.
Merge pull request #5 from johnotander/master

Border-box ftw.