Improved Sample Preparation and Surface Analysis Methodology for Contact Angle Measurements on Coal ( Heterogeneous) Surfaces