Generating c++11 code for kbd.hpp.
Removing redundant test code.
Fixed git merge issue