Allow relative movement from 'go to line' by prefixing line number with '+' or '-'
Add syntax highlighting file for JSON
Replace DEBUG_LOG macro with stream version
Change debugging statements that weren't using DEBUG_LOG to make use of it
Fix typo
s/INCLUDES/AM_CPPFLAGS/
Put 'prev' before 'next'
Make Ctrl-C (and Ctrl-G) exit Help, and Ctrl-C exit from the file browser

Original nano commit: 4610
http://svn.savannah.gnu.org/viewvc?view=rev&root=nano&revision=4610
Original nano commit message:
	Making ^G and ^C exit from help, and ^C from the file browser.
Scrolling an extra amount when softwrap is on and the current line runs off.

Original nano commit: 4611
http://svn.savannah.gnu.org/viewvc?view=rev&root=nano&revision=4611
Original nano commit message:
	Scrolling an extra amount when softwrap is on and the current line runs off.
Tweak regex for multiline strings in Python syntax highlighting

Original nano commit: 4612
http://svn.savannah.gnu.org/viewvc?view=rev&root=nano&revision=4612
Original nano commit message:
	Slightly improving the regexes for multiline strings in Python.
Improve syntax highlighting for manpage files.

Original nano commit: 4614
http://svn.savannah.gnu.org/viewvc?view=rev&root=nano&revision=4614
Original nano commit message:
	Better colouring of manpage files.
Make space work as page down in Help browser

Original nano commit: 4618
http://svn.savannah.gnu.org/viewvc?view=rev&root=nano&revision=4618
Original nano commit message:
	 	Restoring 'Space' as an alias for PageDown in the help browser.
Colorize 'bind' and 'unbind' in pinotrc files

Original nano commut: 4620
http://svn.savannah.gnu.org/viewvc?view=rev&root=nano&revision=4620
Original nano commit message:
	Adding colorization for bind/unbind in nanorc, patch by Mike Frysinger.
Use consistent message to report pipe() failure
Fix typo
Remove unused 'free_shortcutage' function
Improve error messages if magic_load/magic_file fail
Update 'language' setting for Travis CI (changing to 'cpp', was 'c')
Merge branch 'master' into libtermkey

Conflicts:
	src/Makefile.am
	src/pinot.cpp
Revert addition of EventQueue object