5 files changed, 92 insertions, 21 deletions
diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 28dfb82a5..6e45e0521 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -21,8 +21,8 @@ fi
 # Aliases ###################################################################
 # These are for more obscure uses of apt-get and aptitude that aren't covered
 # below.
-alias ag='apt-get'
-alias ap='aptitude'
+alias age='apt-get'
+alias api='aptitude'
 
 # Some self-explanatory aliases
 alias acs="apt-cache search"
diff --git a/plugins/jsontools/README.md b/plugins/jsontools/README.md
new file mode 100644
index 000000000..4faf58b98
--- /dev/null
+++ b/plugins/jsontools/README.md
@@ -0,0 +1,42 @@
+# jsontools
+
+Handy command line tools for dealing with json data.
+
+## Tools
+
+- **pp_json** - pretty prints json
+- **is_json** - returns true if valid json; false otherwise
+- **urlencode_json** - returns a url encoded string for the given json 
+- **urldecode_json** - returns decoded json for the given url encoded string
+
+## Usage
+Usage is simple...just take your json data and pipe it into the appropriate jsontool.
+```sh
+<json data> | <jsontools tool>
+```
+## Examples
+
+##### pp_json
+
+```sh
+# curl json data and pretty print the results
+curl https://coderwall.com/bobwilliams.json | pp_json
+```
+
+##### is_json
+```sh
+# pretty print the contents of an existing json file
+less data.json | is_json
+```
+
+##### urlencode_json
+```sh
+# json data directly from the command line
+echo '{"b":2, "a":1}' | urlencode_json
+```
+
+##### urldecode_json
+```sh
+# url encoded string to decode
+echo '%7B%22b%22:2,%20%22a%22:1%7D%0A' | urldecode_json
+```
+\ No newline at end of file
diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index 7b6f8c585..20d5eb1c9 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -2,15 +2,38 @@
 # Adds command line aliases useful for dealing with JSON
 
 if [[ $(whence $JSONTOOLS_METHOD) = "" ]]; then
-    JSONTOOLS_METHOD=""
+	JSONTOOLS_METHOD=""
 fi
 
 if [[ $(whence node) != "" && ( "x$JSONTOOLS_METHOD" = "x"  || "x$JSONTOOLS_METHOD" = "xnode" ) ]]; then
-    alias pp_json='node -e "console.log(JSON.stringify(process.argv[1]), null, 4)"'
+	alias pp_json='xargs -0 node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));"'
+	alias is_json='xargs -0 node -e "try {json = JSON.parse(process.argv[1]);} catch (e) { console.log(false); json = null; } if(json) { console.log(true); }"'
+	alias urlencode_json='xargs -0 node -e "console.log(encodeURIComponent(process.argv[1]))"'
+	alias urldecode_json='xargs -0 node -e "console.log(decodeURIComponent(process.argv[1]))"'
 elif [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
 	alias pp_json='python -mjson.tool'
+	alias is_json='python -c "
+import json, sys;
+try: 
+	json.loads(sys.stdin.read())
+except ValueError, e: 
+	print False
+else:
+	print True
+sys.exit(0)"'
+	alias urlencode_json='python -c "
+import urllib, json, sys;
+print urllib.quote_plus(sys.stdin.read())
+sys.exit(0)"'
+	alias urldecode_json='python -c "
+import urllib, json, sys;
+print urllib.unquote_plus(sys.stdin.read())
+sys.exit(0)"'
 elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then
 	alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'
+	alias is_json='ruby -e "require \"json\"; begin; JSON.parse(STDIN.read); puts true; rescue Exception => e; puts false; end"'
+	alias urlencode_json='ruby -e "require \"uri\"; puts URI.escape(STDIN.read)"'
+	alias urldecode_json='ruby -e "require \"uri\"; puts URI.unescape(STDIN.read)"'
 fi
 
 unset JSONTOOLS_METHOD
 \ No newline at end of file
diff --git a/plugins/rake-fast/README.md b/plugins/rake-fast/README.md
new file mode 100644
index 000000000..f56142f69
--- /dev/null
+++ b/plugins/rake-fast/README.md
@@ -0,0 +1,23 @@
+# rake-fast
+
+Fast rake autocompletion plugin.
+
+This script caches the output for later usage and significantly speeds it up. It generates a .rake_tasks cache file in parallel to the Rakefile. It also checks the file modification dates to see if it needs to regenerate the cache file.
+
+This is entirely based on [this pull request by Ullrich Schäfer](https://github.com/robb/.dotfiles/pull/10/), which is inspired by [this Ruby on Rails trick from 2006](http://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh/).
+
+Think about that. 2006.
+
+## Installation
+
+Just add the plugin to your `.zshrc`:
+
+```bash
+plugins=(foo bar rake-fast)
+```
+
+You might consider adding `.rake_tasks` to your [global .gitignore](https://help.github.com/articles/ignoring-files#global-gitignore)
+
+## Usage
+
+`rake`, then press tab
diff --git a/plugins/rake-fast/rake-fast.plugin.zsh b/plugins/rake-fast/rake-fast.plugin.zsh
index f4d969c11..cb84f69a1 100644
--- a/plugins/rake-fast/rake-fast.plugin.zsh
+++ b/plugins/rake-fast/rake-fast.plugin.zsh
@@ -1,20 +1,3 @@
-# rake-fast
-# Fast rake autocompletion plugin for oh-my-zsh
-
-# This script caches the output for later usage and significantly speeds it up.
-# It generates a .rake_tasks file in parallel to the Rakefile.
-
-# You'll want to add `.rake_tasks` to your global .git_ignore file:
-# https://help.github.com/articles/ignoring-files#global-gitignore
-
-# You can force .rake_tasks to refresh with:
-# $ rake_refresh
-
-# This is entirely based on Ullrich Schäfer's work
-# (https://github.com/robb/.dotfiles/pull/10/),
-# which is inspired by this Ruby on Rails trick from 2006:
-# http://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh/
-
 _rake_refresh () {
   if [ -f .rake_tasks ]; then
     rm .rake_tasks