Changed shebang so custom script still work.
BRANCH: Merged
Add vbuf for git update-feature.
Add the feature-update script.

Will squash the develop branch into a feature branch to keep it up to date.
Merge branch 'feature/git/update-feature' into develop
Merge (squash) branch 'develop' into 'feature/bugfix/prompt/parese-error-pipe'
Change merge message.
Merge with develop
Stop conveting hg/git aliases when they are vanilla commands.
Fix arrayRemoveIndex potential parsing errors.

The function was choking on potential && and || bits. Forced typing to string
to fix it.
Merge branch 'feature/bugfix/prompt/parse-error-pipe' into develop
Squashed commit of the following:

commit 285a71efc0e16e082635c663c2537e614d56ae0d
Merge: 46043d2 9d15295
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 17:50:14 2012 +1300

    Merge branch 'feature/bugfix/prompt/parse-error-pipe' into develop

commit 9d15295377fe3a13f92df63fdc66fa1bea1f4bb7
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 17:49:04 2012 +1300

    Fix arrayRemoveIndex potential parsing errors.

    The function was choking on potential && and || bits. Forced typing to string
    to fix it.

commit dd11ace16e0d54f86a3fab4482af5244c20c116e
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 17:29:24 2012 +1300

    Stop conveting hg/git aliases when they are vanilla commands.

commit 79bafca0ab35e9dfcabf222941118b3a774e0374
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 17:11:12 2012 +1300

    Merge with develop

commit 46043d23a9748b08b6edf2adedfdc89bc0bb9f4b
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 17:08:11 2012 +1300

    Change merge message.

commit 50c5bb26cc1183f7fa84fd869f494afb73f66a05
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 17:06:00 2012 +1300

    Merge (squash) branch 'develop' into 'feature/bugfix/prompt/parese-error-pipe'

commit eaf9aa75c4cabb4e2b247b63b75c43853ba178c7
Merge: ac96f1d d7dd88d
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 17:03:46 2012 +1300

    Merge branch 'feature/git/update-feature' into develop

commit d7dd88d8e94c7fdc4b6aa8630eac410924fc6dd2
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 17:02:56 2012 +1300

    Add the feature-update script.

    Will squash the develop branch into a feature branch to keep it up to date.

commit 33c18337e7e3e5aefcb4e10dd08ca376b5d4ac1c
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 16:51:19 2012 +1300

    Add vbuf for git update-feature.

commit e12d1730fb49e59f86273cb2884e86f49703b6ae
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 16:47:03 2012 +1300

    BRANCH: Merged

commit ac96f1d204c9321695ec055abacf25dc95d9ff96
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 16:45:16 2012 +1300

    Changed shebang so custom script still work.

commit d1a6533d365f1661149b6831a93e6125281f8a5a
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 13:28:35 2012 +1300

    Fix push aliases.

commit b1075eb66ee27416aa2e2deffc28aeca2415c766
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 13:25:46 2012 +1300

    Add alias to merge develop in master and push them.

commit f26c2e52b0c5b526c3c2521a9ed1f3c523dbe8dd
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 13:15:28 2012 +1300

    Add file diff aliases and flow * finish aliases.

commit 0e12db5ef90e7634a7c449525b89ec84c18eab14
Merge: 96717ec 424f2da
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 12:53:10 2012 +1300

    Merge branch 'feature/git/flow-bugfix' into develop

commit 424f2da432b02843dbff6bf159fec1bf7241f5d0
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 12:52:44 2012 +1300

    Make the flow-bugfix work with finish, publish and pull.

commit 09bb87d9ef5edc9fa614efe59ee5603fa9c6046f
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 12:51:03 2012 +1300

    Fix aliases.

commit 8d7fe2d0bddefdfb4b1f4aeeaed78fed437cfe7d
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 12:48:10 2012 +1300

    Added vfb* aliases.

commit 3f17d0e399032ddf961de4db8f7f51014c6c608e
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 12:45:25 2012 +1300

    Added git-flow-bugfix command.

commit 96717ecbce72f70c14d3cff8dfd4ee94df5dad6b
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 12:38:06 2012 +1300

    Update branch name in prompt when updating git status.

commit 28b6cc1a85b90dbbb027c2238695a15db512dee3
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 12:36:00 2012 +1300

    Change default shebang used in `touchx`.

commit d64dbb0794da8d3b8f6cfea6ec0299dcfab4b6b2
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 12:34:33 2012 +1300

    Start git flow bugfix feature.

commit c81a759187b4203e1777041b37409fa1eba5d0e0
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 02:00:58 2012 +1300

    Fix vfff alias.

commit 5d9b40933ad6636f51f2893eefbf51e10683b1e1
Merge: 46b1c50 74f38b4
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 01:56:37 2012 +1300

    Merge branch 'feature/prompt/git-flow' into develop

commit 74f38b4a9340266cf51c2c0a33a6de3a8f06e647
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 01:54:24 2012 +1300

    Adding bin and tests to check bugfix coloring.

commit 76136a6ca6d4d6b55a4de4e54bf462745b248bd0
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 01:40:51 2012 +1300

    Coloring of a whole output works.

commit e3c43d3b073578a03f881ef6c37411ff0ab4ad2b
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 01:31:18 2012 +1300

    Moved in one regexp.

commit 1364323806f822c0e1db0289e7edba5203e19adb
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 01:30:18 2012 +1300

    Parsing prefix and full branchname.

commit bb52554f8be576ccb3d24a86b216a7565c0900ee
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 01:29:04 2012 +1300

    feature branch colored

commit e7bfb5664ac6edab9c74bd86d3a5029b6bedb141
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 01:14:03 2012 +1300

    Refactor.

commit 08dc2e7e007e663fd98dac4e4b4c45103e11ad9b
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 00:43:39 2012 +1300

    Branch master and develop colored.

commit 602a0079a320d334ed67f30d752cfc1f0463f822
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 00:22:14 2012 +1300

    More tests for 2digits color codes.

commit 4554e8b3e50fc255e3c49618c6523cd7d4ab923a
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 00:18:28 2012 +1300

    Added color_text.

commit 590fc71d17870a789cef7c250f2fc30102e1e2ab
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 18 00:11:51 2012 +1300

    Add initialize.

commit ec94fd5b08c01f1dd35e45fab6c8d49b01180039
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Nov 17 23:58:40 2012 +1300

    Added git-branch-list.rb and branch line parsed.

commit 8e4c54180d28b17f575f252995a72adb25cfc33c
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Nov 17 23:43:04 2012 +1300

    Cosmetic fixes.

commit 29a73bfc7b5faea051e8461864bf6a351b2bda55
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Nov 17 18:40:20 2012 +1300

    Updated gitconfig alias list.

commit 95198d3ad7e8d5b5a6f60070a9e49fa9bcf8c7ca
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Nov 17 18:28:40 2012 +1300

    Updated commit message when mergin develop.

commit be1d63d2192bb23b33bfd5369bcb8668f4003ec8
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Nov 17 18:26:50 2012 +1300

    Merged develop

commit 44bebf347739f10bcd5befa1fb7ad9ce5982dcdf
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Nov 17 18:26:22 2012 +1300

    Add vbmd to merge back develop into feature branch.

commit 46b1c50fe223bfa035df7bc5e2b5c4b2f885ecfc
Merge: 8db0136 fb26c8d
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Nov 17 18:23:27 2012 +1300

    Merge branch 'feature/zsh5.0' into develop

commit fb26c8d810a5e94cb74f0a88a4514c3f56f9c35b
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Nov 17 18:20:30 2012 +1300

    Fixing custom keys.

commit 6d753b41945758ba9a41578ce13e02b79abf93b1
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Nov 17 18:20:19 2012 +1300

    Fixing comments.

commit 440bd4bf6bb92559e221f976e659fc86e0e1bf31
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Nov 17 17:52:16 2012 +1300

    Changed shebang in deploy scripts.

commit c0fa7d36db95cb59b32dcf302ea4e51c5afd3e6c
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Nov 17 17:51:17 2012 +1300

    Changed shebang in eddie-specific scripts.

commit f4f3b0ba9cac200a09a61997e38a2495d1bd3e31
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Nov 17 17:50:32 2012 +1300

    Changed shebang to use /usr/bin/env zsh.

commit 59b4d257233cd1abceb1a5bef89d2c1d4c06f32f
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Nov 17 17:44:04 2012 +1300

    Added reboot notice after zsh 5 install.

commit 53e4d421d5f5717485e5b04f1c8aec90f2570e09
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Nov 17 17:31:57 2012 +1300

    Changed zsh shebang for better compatibility.

commit 1ed9d2960c6ee6f9f5eacd62b4484415440a38db
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Nov 17 17:31:42 2012 +1300

    Updated syntastic submodule.

commit 0870f00d38d4fd022552eab353e6ff6366191e35
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Nov 17 17:09:25 2012 +1300

    Add zsh 5.0 install script.

commit ea71913b2afeb38d669361b28f9f13fcd7eec4a9
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Nov 16 17:04:19 2012 +1300

    Fix parsing of bugfix branch.

commit fdb592d28a5375e3f5715b9c41e39be7039d6c92
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Nov 16 17:00:20 2012 +1300

    Add git-flow aliases.

commit ae325ef1c10e9096131c133001bdf675845eb62a
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Nov 16 16:52:10 2012 +1300

    Display branch color in prompt.

commit 5fefdf8aa34a2bead19711cec23c607416d6be03
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Nov 16 16:29:46 2012 +1300

    Improved git stash aliases.

commit 22b740e0ec5b97398f31f8a9588bc4f8befe5889
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Nov 16 16:26:44 2012 +1300

    New line.

commit 9bcd99009239542e9cdeee2d48276dc9ff284636
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Nov 16 15:30:18 2012 +1300

    Add default colors for branches.

commit 8db0136cb14f14a38bbcd17145186c5eb14dd844
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Nov 16 13:33:20 2012 +1300

    Add alias to rename git branch.

commit 2842613ef7816b5b6d9f5eab222e159455601fa4
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Nov 16 12:43:27 2012 +1300

    Fix symlink creation on git-flow.

commit 2d8a7001fac5558a3b4e94bfd6a8e144f3c3af24
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Nov 16 12:34:42 2012 +1300

    Added git-flow install script.

commit da2e667ebc1d6b7d5ba36bda6112908048ca858e
Author: Pixelastic <tim@pixelastic.com>
Date:   Thu Nov 15 23:30:28 2012 +1300

    Fix folding preview not working correctly in text files.

commit 93e80a9d8a32a79c87087e55b7b763cb6dd2d9b9
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Nov 10 19:06:11 2012 +1300

    Add 7z as an archive file.

commit 7a05a9e1bdf7256b4049994224a903093c17de10
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Nov 10 15:18:48 2012 +1300

    Update emu to remove Book Producer from epub.

commit e68ee268f6d0ffda2d8b786e73797818e83821dc
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Nov 9 18:53:24 2012 +1300

    Add alias for ebook-data.

commit e619cee9ec7a1b299a1b5c93d158e337f8599298
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 4 22:47:01 2012 +1300

    Fix parsing of author.

commit a7fe9eafd461ab8bebb3239ff665be6f2a8d5361
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 4 22:41:40 2012 +1300

    Fix bad escaping of chars in ebook-metadata-update.

commit c961361a16a4a017ec2ad5bc1feb3ff113489c46
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 4 22:20:48 2012 +1300

    Add ebook-metadata-update which rewrite epub metadata based on the file name.

commit 1047a702a88b2cd20ff029c0bcfa122d1234a5fd
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 4 21:23:51 2012 +1300

    Typo fix.

commit af6e5d7b917c46b3575016f31a8047c61c339882
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 4 20:54:55 2012 +1300

    Add auto-completion for ebook-cover-change.

commit 847357dfe738a05fd8465425ce7259a0facb8763
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 4 20:49:20 2012 +1300

    Color .bak files as tmp files.

commit 06704adf29c543cfd9c66d81e8c73515c0e397a6
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 4 20:48:07 2012 +1300

    Add alias for ebook-cover-change.

commit e0f6ce83f68faf03ccff7261306f0d52f93d7926
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 4 20:47:02 2012 +1300

    Optimize epub cover before changing it.

commit cf2d021e95ec561da5e7eccffa5a5dfe03f40804
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 4 20:13:49 2012 +1300

    Add ebook-change-cover.

commit b977aa5d082e3acdd11beb1c1cc03dde9692272d
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Nov 4 19:29:30 2012 +1300

    Remove the searching for cover online when converting an epub to txt.

commit e4bfaa7e5f6c663269f9748cd3043640c5a07054
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Nov 3 15:09:52 2012 +1300

    Added alias to merge master in branch in one commit.

commit e0e72782b8f6478d62e2d87a6b03d3b1dafb51ee
Author: Pixelastic <tim@pixelastic.com>
Date:   Wed Oct 31 15:11:52 2012 +1300

    Add wt alias to watch tree.

commit 3d71830f97dbdac6395d5fdf5e5288cfea0e7e75
Author: Pixelastic <tim@pixelastic.com>
Date:   Mon Oct 29 23:41:32 2012 +1300

    Add 500px script to download beautiful pictures.

commit 120f49b8b682a1d22098379ddc5fa412e2510f3c
Author: Pixelastic <tim@pixelastic.com>
Date:   Mon Oct 29 22:47:45 2012 +1300

    Fix json formatter in vim.

commit a929205e194c3e1f6a6580a5937f51f2d3dcb233
Author: Pixelastic <tim@pixelastic.com>
Date:   Mon Oct 29 22:47:06 2012 +1300

    Add `json` script to pretty print JSON.

commit ceb8ce8f13b961d541f9791bd968383af2c0842a
Author: Pixelastic <tim@pixelastic.com>
Date:   Mon Oct 29 22:10:20 2012 +1300

    Add how to install curb for ruby.

commit e39ee91446fca456916e03e8543b53f57b0c92a5
Author: Pixelastic <tim@pixelastic.com>
Date:   Mon Oct 29 20:57:08 2012 +1300

    Update submodule.

commit fc66bfaa8d9d1374aa02ded9332cc5ed24115c81
Author: Pixelastic <tim@pixelastic.com>
Date:   Mon Oct 29 19:36:57 2012 +1300

    Add --no-ff option to merge by default.

commit 7de41afef0e17054ad379e6693f1c540e022f85d
Author: Pixelastic <tim@pixelastic.com>
Date:   Mon Oct 29 18:25:17 2012 +1300

    Make v* alias more foolproof.

commit bd88a0a593f43a3d593a338b70eec05798feb444
Author: Pixelastic <tim@pixelastic.com>
Date:   Mon Oct 29 19:10:15 2012 +1300

    Split all install script in separate files.

commit 87b3079bfe98a81e06fc8bdf76376d91609fca34
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Oct 27 22:25:40 2012 +1300

    Extract pictures from mkd as well as txt.

commit 99cabadd01e50981eb2d45ebf7b8374baca0b723
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Oct 26 20:57:59 2012 +1300

    Add vim-ruby submodule.

commit 43c2a3d0ea7cce885635e75ef128b79052944661
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Oct 26 20:52:21 2012 +1300

    Add a ruby skeleton.

commit e77649f5ab49bae630dd8d438a9f7200f6209450
Author: Pixelastic <tim@pixelastic.com>
Date:   Thu Oct 25 22:27:49 2012 +1300

    Fix cdsov alias.

commit fcb20ec0de8e740ba86d61ebb161e769db99998e
Author: Pixelastic <tim@pixelastic.com>
Date:   Thu Oct 25 21:52:04 2012 +1300

    Change alias for documentation.

commit 600e7c95658ee5a4e1871bbc6039d90c246524f0
Author: Pixelastic <tim@pixelastic.com>
Date:   Thu Oct 25 21:51:44 2012 +1300

    Add script to move each file to a matching dir.

commit bd108d6b4164ea45e5928f4b00733e4982d74388
Author: Pixelastic <tim@pixelastic.com>
Date:   Thu Oct 25 17:00:41 2012 +1300

    Fix typo.

commit 39be94f627765f8773801f0bd2ab17d027bfacbd
Author: Pixelastic <tim@pixelastic.com>
Date:   Thu Oct 25 16:54:38 2012 +1300

    git submodule commands now updates hash in prompt.

commit f6c0d2972dd5ecd47cef2d8119ca08b77c0d5595
Author: Pixelastic <tim@pixelastic.com>
Date:   Thu Oct 25 16:41:00 2012 +1300

    Add git submodules aliases.

commit 0775b178a018a0a11d7562bfb1d88bbb895c6f77
Author: Pixelastic <tim@pixelastic.com>
Date:   Tue Oct 23 23:33:09 2012 +1300

    Add TODO for convert-music.

commit 344bc567667fb2af6b9cd76a656139bcba08e75a
Author: Pixelastic <tim@pixelastic.com>
Date:   Tue Oct 23 21:23:20 2012 +1300

    Add `expand-path` script.

commit 55fe860dec6a26c88ee77e27c76adf72551cb492
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Oct 19 17:18:04 2012 +1300

    Add plowshare install instructions.

commit 23124e7e1aa93d48e45427db76e892ad62a4d091
Author: Pixelastic <tim@pixelastic.com>
Date:   Tue Oct 16 19:10:47 2012 +1300

    Add alias for plowdown.

commit 702a2257550293540bce527201980ed413321a61
Author: Pixelastic <tim@pixelastic.com>
Date:   Mon Oct 15 21:38:32 2012 +1300

    Correctly escape filepath in txt2epub

commit 42dd3162e8078e746eeb3ba317afa88df5482177
Author: Pixelastic <tim@pixelastic.com>
Date:   Mon Oct 15 15:30:51 2012 +1300

    Fix remote bitbucket url.

commit d4e5bc7942a12f7b01b6fdc2ef6e2bbd6357ff76
Author: Pixelastic <tim@pixelastic.com>
Date:   Mon Oct 15 15:26:10 2012 +1300

    Fix wrong removal of aliases.

commit 1d6f17a81379e5785750ec32b1c0ed125c79880d
Author: Pixelastic <tim@pixelastic.com>
Date:   Mon Oct 15 14:41:39 2012 +1300

    Set vdc and vdt generic aliases.

commit 64b9bf93500ce57acc64660e67addcce35eb5683
Author: Pixelastic <tim@pixelastic.com>
Date:   Mon Oct 15 14:40:02 2012 +1300

    Add `get-version-system` script.

commit ef656835831dcab0388e3197e33d5759253f5d67
Author: Pixelastic <tim@pixelastic.com>
Date:   Mon Oct 15 14:39:03 2012 +1300

    Update `create-repo` to allow for github or bitbucket hosting.

commit 38f6e0abba8d27443eb5a86ec239c47f71d8c182
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Oct 14 23:35:04 2012 +1300

    Update FixEpub to use markdown formatting.

commit 6be05e587162b722f572bf8f947165a313f9bee7
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Oct 14 22:11:49 2012 +1300

    Txt files extracted from ebooks considered markdown.

commit fb98638b23d8cbfe12f0793ec4cb0d1c77e1112f
Author: Pixelastic <tim@pixelastic.com>
Date:   Sun Oct 14 22:03:46 2012 +1300

    Use markdown to convert txt to epub.

commit 99b84cd689c25c7df8504e697242e07d06c22571
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Oct 13 22:44:25 2012 +1300

    Add Ç to xmodmaprc.

commit 6501454909166c436f7d9e5269f3233dc6484494
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Oct 12 23:50:50 2012 +1300

    Update submodules.

commit 1993592a86266b9f36d42306ffd27d2213555b7f
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Oct 12 22:05:16 2012 +1300

    Add git create-repo alias to init a clean new repo.

commit 3bd49aa0858aaa34551ba020d10d5de8f5b62484
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Oct 12 21:30:33 2012 +1300

    Update submodule.

commit 85cb86a573dd3099242f88aec12147671687cf74
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Oct 12 21:30:18 2012 +1300

    Change vra to vrc.

commit bc583bb2fc4c51c90b2ec8e9a47e93f3cd0b4fac
Author: Pixelastic <tim@pixelastic.com>
Date:   Thu Oct 11 23:21:04 2012 +1300

    Add vim Splitest submodule.

commit c1fdb476a547465fb5fbafb137bd5cceb54ef141
Author: Pixelastic <tim@pixelastic.com>
Date:   Thu Oct 11 23:19:36 2012 +1300

    Splits below.

commit 82a0573a671dc9d20c28132a09e9f591020b8122
Author: Pixelastic <tim@pixelastic.com>
Date:   Thu Oct 11 23:18:59 2012 +1300

    Fix CtrlF so multiple search still search in the same repo root.

commit 7ebfd5a8a873cf032004abc5f27a6e15aca2bdb2
Merge: 6e7757f 977f3c1
Author: Pixelastic <tim@pixelastic.com>
Date:   Wed Oct 10 22:25:19 2012 +1300

    Merge branch 'master' into feature-ruby-syntaxcheck

commit 977f3c18f88a949d797b451088fb3fa7d1295b16
Author: Pixelastic <tim@pixelastic.com>
Date:   Wed Oct 10 22:23:42 2012 +1300

    Add vbmm to merge with master branch.

commit 6e7757f7906abbc352df26ea396f13bfe376b188
Author: Pixelastic <tim@pixelastic.com>
Date:   Wed Oct 10 22:22:27 2012 +1300

    Enabling syntastic.

commit d96c776dc4f5cc981a1a10bb87b2d78c4513689b
Author: Pixelastic <tim@pixelastic.com>
Date:   Tue Oct 9 18:14:04 2012 +1300

    Update xmodmap to re-add €, ™ and ¥.

commit 8db99c21a429cdde840f9286e4648d4418cecc1e
Author: Pixelastic <tim@pixelastic.com>
Date:   Tue Oct 9 18:04:49 2012 +1300

    Act on fullpaths with epub2txt

commit cdcefb078647b16587b8de2c99590136886db431
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Oct 6 18:47:43 2012 +1300

    Update txt2epub for more verbose output.

commit 5dcc5bb5c10764d45732797e9f8b1622f9ec490a
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Oct 6 18:47:06 2012 +1300

    Fix epub2txt so it can process multiple files.

commit eee0066db2cfdf97e26e5ca6789443a928871c54
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Oct 6 17:53:03 2012 +1300

    Backup existing epub with txt2epub.

commit e135a586a5a16c7d2b25e807aee3172e93da7ea9
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Oct 6 17:01:10 2012 +1300

    Add more regexp to fix epubs.

commit b68a70a14314a13034f97cc5898aef5f6411664d
Author: Pixelastic <tim@pixelastic.com>
Date:   Sat Oct 6 00:09:22 2012 +1300

    Refactoring of completion functions.

commit c864e34f85b14a3f6595c0af61e8e4f73b46002d
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Oct 5 23:15:58 2012 +1300

    Suggest .epub files with ebook-viewer.

commit 5678bf8808413405fe3a403aca263b067710ab44
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Oct 5 23:11:13 2012 +1300

    Add ebook-related aliases.

commit c8528dd0a06231200ac9f8da5dad7c1b524035ff
Merge: 6dab666 6a80850
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Oct 5 23:04:24 2012 +1300

    Merge branch 'feature-ebook-cover'

commit 6dab666bdbded249228999529659fe41d6bb04df
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Oct 5 23:04:08 2012 +1300

    Update private submodule.

commit 6a808503b99115d44ccf3a79234a74ebe5ae4dda
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Oct 5 23:03:00 2012 +1300

    Converting txt<->epub now keeps cover image.

commit 67c52f13461bc48af9a7156ae399ea7e4ea22bb9
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Oct 5 12:54:39 2012 +1300

    Update txt2epub to include cover.

commit 382b5a88b40782056cae9a44b8934de6f3c645c4
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Oct 5 01:43:18 2012 +1300

    Add ebook-isbn and ebook-cover as well as autocomplete for them.

commit d8f7e4b591c0e516a9390e50df3315b0b8da7ec1
Author: Pixelastic <tim@pixelastic.com>
Date:   Fri Oct 5 00:52:59 2012 +1300

    Remove useless inoremap in ruby.
Added more space around submodule icon.
Change submodule icon when changing repo root.
Merge branch 'feature/bugfix/prompt/submodule-cding-out' into develop
Merge (squash) branch 'develop'
Changed vdd alias to git diff.
Do not display prompt info in .git and .hg.
Merge branch 'feature/bugfix/prompt/wrong-color-in-dot-git' into develop

Conflicts:
	config/zsh/aliases-git.zsh
	scripts/bin/get-version-system
Typo fix in alias file to load.