Merge branch 'refs/heads/master' into develop
Merge branch 'refs/heads/develop'
added elocate plugin for braindead solaris boxes
added global 'ask' function
updates for pinkbox plugin
better tmux aliases
moved the 'v' alias out of the plugin and into my own personal aliases
Merge branch 'refs/heads/develop'
bumped version