Improved Border Handling

Now include border sizes in width/height calculations. Fixed to work in jQuery no-conflict mode.