Change controls fade out timeout to 2 seconds from 4

And speed up the fade out animation time.

fixes #53
Yeah, are you just never updating these? Is there a way to make sure they never get included?