emacs: merlin-show-type-def
emacs: changed keybinding of C-c C-t to the magical binding.
emacs: make output of show type function consistent.
README: updated emacs section
emacs: C-c C-t falls back to the previous binding if it fails.
vim: more conservative synchronization heuristic

Hopefully less buggy!
emacs: prevents from hanging
configure: Use tput instead of hardcoded color constants
vim: remove Counter from python code, no longer rely on python2.7+
Fix pretty printing of types

Use type_scheme instead of type_expr, use generic level for printing.
Temporary: fix locations in optarg desugaring
vim: refactor and adjust typing heuristics
vim: Fix format string syntax for compat with py < 2.7
vim: Return completions compatible with vim < 7.3
vim: hide enclosing when shrinking/growing too much
emacs: merlin does not fail when started on non file buffers.
emacs: the lock zone is now displayed using the margin by default.
Merge branch 'experimental'

Conflicts:
	vim/autoload/merlin.py
vim-mode: Tweak type printing heuristic
Apply relevant modifications from type-error branch.