Branes and Geometry in String and M-Theory