Import r1247

r1247 | svkaiser | 2014-01-05 23:40:33 -0800 (Sun, 05 Jan 2014)

+ Fully re-bindable XInput buttons support
+ Cleaned up and improved controls menu
+ Fixed 'nice things' automap drawing code