clean up the keypad, add the ability to cancel out of modal
Merge pull request #25 from orta/prototype

@ashfurrow => clean up the keypad, add the ability to cancel out of modal