require markdown-mode
enable orgtbl-mode in markdown-mode
let ack recognize markdown files
add emacs snippets
enable oh-my-zsh update prompt
set scroll-margin & delete code to enable helm
clean comments
revert set scroll-margin

Some conflict with page-forward
Squashed 'emacs.d/' changes from fa6795b..8a3e01c

8a3e01c [Fix #484] Set OS X specific latex settings conditionally
1bb8852 Merge pull request #485 from bixuanzju/patch-1
430c982 web-mode is now compatible with minor modes
8943f98 Merge pull request #476 from ardumont/add-duckduckgo-search-engine
f83428f Add binding `C-c U` for DuckDuckGo search
7cca7f7 Add DuckDuckGo search engine in the default list.
8e573e1 Factor the search engine installation to ease the future install of new ones.
9fb9540 Merge pull request #473 from jehrhardt/podfiles
0a1e8e4 Use ruby-mode for Podfile
2c28558 Merge pull request #465 from bixuanzju/patch-1
1bbdf92 Update prelude-lisp.el
abe95bc Mention guru-warn-only
015c2de Bind ace-jump-mode to s-. as well
f573fd9 Change C-c SPC to C-c j to avoid a conflict in org-mode
7909617 Don't use C-x SPC as it's used in Emacs 24.4 by default for rectangular selection

git-subtree-dir: emacs.d
git-subtree-split: 8a3e01cd32da8788804b14f4dd55d34a723f404b
Merge commit '089aebe4848214a07a78b71402b2562e1aa3bbaa'
Squashed 'oh-my-zsh/' changes from a38af27..4ce7f0a

4ce7f0a Merge pull request #2515 from nupfel/plugins/iwhois
2ed9903 Merge pull request #2516 from lukesteensen/patch-1
0d212bb Add 'services' command to homebrew completion
0cb2ecf provides iwhois command to use CNAMES under whois.geek.nz to find most accurate whois server
ec37c05 Merge pull request #2465 from klange/master
7a6e2c0 Merge pull request #2342 from blackjid/master
41d9717 Merge pull request #2402 from bric3/battery_level_gauge
df0305a Merge pull request #2368 from lumbric/master
a48fd1e Update nyan.plugin.zsh
9b3344d change nyancat telnet server
cc8b093 Adds a method that print a battery gauge
d485044 Merge pull request #2389 from driver2000/patch-1
a609fd5 Merge pull request #2398 from phstc/fixes-tmuxinator-plugin-find
4354f91 Fixes tmuxinator plugin find on OSX
e2838f7 Merge pull request #2396 from soluwalana/master
d60522c escape dashes
827d9df Update git.plugin.zsh
3e5e2d4 Fix bad right prompt placing.
b58b996 fix name schema for sudo plugin
dbdd23d Prevents oh-my-zsh loading the .zshenv twice

git-subtree-dir: oh-my-zsh
git-subtree-split: 4ce7f0a37f9a13c605225e2a595ad1bdf6171065
Merge commit '9fd70ed9312b55cf0a0908915a680f8ee2c6fe37'
Squashed 'emacs.d/vendor/python-mode/' changes from 0b13019..406a54e

406a54e `py-set-ipython-completion-command-string' detect ending "-dev", lp:1276890
7ae860f Debugger menu extended
c5d35e9 save-excursion should not annihilate the result of `py-shell-manage-windows'
c33982f Provide missing variables
f9a2b31 py-electric-yank-active-p, default nil    When non-nil, yank will be followed by an indent-according-to-mode.
284ed4b doku updated
500f2ce `py-shell-manage-windows', lp:1273902
9ef32ee `py-beginning-of-paragraph-position', `py-end-of-paragraph-position',
836e6bd `py-end-of-top-level' fixed
dd3c331 Keep previous state of `abbrevs-changed', lp:1270631
f30a5c2 `abbrevs-changed' t when starting, lp:1270631
9002e6a Execute-region_statement-runs-full-file, lp:1269855
6bdfe5e Redundancy in py-execute-ge24.3 removed
da1cc5a `py-indent-tabs-mode-off' docu typo

git-subtree-dir: emacs.d/vendor/python-mode
git-subtree-split: 406a54e1150f10e47fceb13d133a868709e50fb1
Merge commit 'c899d5c8d4e12706e6763c31dde9c25b8daa269d'
add script to update subtree
add sqliterc