Modify element height calculation to account for margin collapsing

[mfeingold]

Follow the recommendation of meden in the response to me question below

http://stackoverflow.com/questions/19235832/outerheighttrue-does-not-include-margins