Merge branch 'fix_diff' of git://github.com/fgalassi/vimgolf
Merge branch 'dev' into ilya-master
added more terminal escapes from vim documentation and source
change C-Space to more common representation C-@
added KS_EXTRA (0xfd) escape sequences from vim source
ignore focus gained and lost (Gvim) escapes since they are not sent for keys actually pressed
fixed small error in put diff/retry/quit loop
Merge pull request #81 from fgalassi/better_terminal_conversion

Better terminal conversion
fix failure on execution of Keylog specs
rename VimGolf.ui.ask to ask_question to avoid clash with Thor
Merge branch 'master' of github.com:igrigorik/vimgolf

Conflicts:
	lib/vimgolf/cli.rb
Keylog refactoring
code refactoring, Challenge object
protect input_file by having a work file where actual changes are done
Merge pull request #83 from fgalassi/refactoring

Refactoring
cleanup spec infrastructure
bump to 0.4.0
update readme, add link to emacs mode
fix CLI merge bug
Added challenge browser to emacs package.