Add fast math entry methods
Fix for ESC -> meta in terminal mode.

If you hit esc-key in terminal mode very quickly, it gets interpreted
as meta-key, which makes evil-mode unusable in terminal mode. The
default value of 0.01 doesn't completely fix this behavior, but
setting it to 0 does. The meta key still works fine with it at 0.
Add the git-timemachine package
Add some suggestions from Sacha's org-mode page.
Use add-to-list to prevent destroying previously set frame features.
fixed a bug in prelude-create-scratch-buffer
Merge pull request #619 from danielwuz/create-new-buffer

fixed a bug in prelude-create-scratch-buffer
Merge pull request #612 from alexeyr/fast-math-entry

Add fast math entry methods
Activate company mode support for merlin

Also, provide a commented out sample for activating autocomplete support
Remove hook to activate an apparently obsolete tuareg function

Trivially fixes #614 by simply removing the offending hook.
Merge pull request #624 from RadicalZephyr/prelude-ocaml-fix

prelude-ocaml fix
Merge branch 'master' of github.com:bbatsov/prelude
Fix editing remote unwriteable file

With the original advice, if we try to find a not writeable file on a
remote machine, the extra tramp prefix would be inserted. As a result,
we actually end up in a blank new file.
Merge pull request #627 from toctan/sudo-tramp

Fix editing remote unwriteable file
A better `prelude-view-url`

- remove HTTP headers, what we care most of the time is the content
- `set-auto-mode` is way better than the naive xml, html tag check
Update README
Merge pull request #628 from toctan/view-url

A better `prelude-view-url`
added (interactive-haskell-mode) to enable the use of interactive haskell commands (such as C-c C-l to load file)
Merge pull request #630 from mijoharas/master

added (interactive-haskell-mode)
Merge pull request #613 from roryk/upstream

fix for evil-mode in terminal