Merge remote-tracking branch 'upstream/vty-5.0' into vty-5.0
use vim2 in corey keymap
use Vty.rgb_color instead of bailing when an arbitrary RGB color is used
Merge remote-tracking branch 'upstream/vty-5.0'
Update upper alex version bound to 3.1.2.
Ask travis to build with GHC HEAD too.
Merge remote-tracking branch 'upstream/master'
More informative error from ghciLoadBuffer
Remove redundant Data.Binary import
Remove no longer necessary qualified name
Don't use LambdaCase to allow building with ≤7.6.1
Get rid of a trailing whitespace.

If this causes problems for anyone browsing git logs, ask git to not
show you whitespace-only changes.
Honour -y flag.

Perhaps we should warn the user if the directory chosen with -y doesn't
exist or doesn't house the config file.
Remove upper bound on alex version.
Merge pull request #464 from Fuuzetsu/ghciMsg

ghciLoadBuffer error message improvement
Merge pull request #466 from Fuuzetsu/whitespace

Get rid of a trailing whitespace.
Ensure that -y also affects the modules directory
Merge remote-tracking branch 'fuuzetsu/honour-y'

Conflicts:
	yi/src/library/Yi/Boot.hs
Remove upper bound for template-haskell.
Remove unused Vte.hs