Updated .rbenv
Merge remote-tracking branch 'origin/master' into develop

* origin/master:
  Updated bash-it (from Shutterstock)
  One time.
  Updated bash-it.
Updated local Git config.
Updated from env to tilde.
Deleted ls++ and moved around base config.
Updated rc files.
Updated Bash entry file.
(weechat) Added config for amarok2.pl
Finally figured out why I couldn't go up in Vim.
Updated my bash-it.
Removed breaking tmux options.
Updated tmux, rbenv and bash-it.
Merge remote-tracking branch 'origin/master'

* origin/master:
  Check for fortune_mod.
  Update variables.sh
  Updated bash-it (from Shutterstock)
Merge branch 'develop'

* develop:
  Removed breaking tmux options.
  Updated my bash-it.
  Finally figured out why I couldn't go up in Vim.
  (weechat) Added config for amarok2.pl
  Updated Bash entry file.
  Updated rc files.
  Deleted ls++ and moved around base config.
  Updated from env to tilde.
  Updated local Git config.
  Updated .rbenv

Conflicts:
	home/.bash/base.bash
	home/.bash/bash-it
Moved around some options for copying & pasting.