Added T1 fontenc and fixed some shizzle
Merge