Merge pull request #20 from emailsucks/dev_main

Main into dev_mark
box route add html/text
Merge pull request #22 from emailsucks/dev_main

merge from dev main
slight changes to box model
Merge pull request #23 from emailsucks/dev_mark

Dev mark