Brought up to date with 1.5.1, fixed some errors with bad map formation and split out javax and awt functions into a separate namespace, allowing the ascii-only functionality to be used on platforms without full java