Merge branch 'master' into develop

Conflicts:
	plugins/available/sdkman.plugin.bash
	themes/base.theme.bash

aliases/available/emacs.aliases.bash

@@ -8,7 +8,7 @@ case $OSTYPE in
     alias e='emacsclient -n'
     alias et='emacsclient -t'
     alias ed='emacs --daemon'
-    alias E='SUDO_EDITOR="emacsclient" sudo -e'
+    alias E='SUDO_EDITOR=emacsclient sudo -e'
     ;;
   darwin*)
     alias em='open -a emacs'

plugins/available/sdkman.plugin.bash

@@ -1,6 +1,5 @@
 cite about-plugin
-about-plugin 'load Software Development Kit Manager. See http://sdkman.io'
+about-plugin 'Load Software Development Kit Manager'
 
 export SDKMAN_DIR="$HOME/.sdkman"
-
 [[ -s "${SDKMAN_DIR}/bin/sdkman-init.sh" ]] && source "${SDKMAN_DIR}/bin/sdkman-init.sh"

themes/base.theme.bash

@@ -95,9 +95,9 @@ function scm_prompt_info {
 function git_status_summary {
   awk '
   BEGIN {
-    untracked = 0
-    unstaged = 0
-    staged = 0
+    untracked=0;
+    unstaged=0;
+    staged=0;
   }
   {
     if (!after_first && $0 ~ /^##.+/) {

themes/powerline-multiline/powerline-multiline.theme.bash

@@ -42,9 +42,8 @@ THEME_PROMPT_CLOCK_FORMAT=${POWERLINE_PROMPT_CLOCK_FORMAT:="%H:%M:%S"}
 IN_VIM_THEME_PROMPT_COLOR=245
 IN_VIM_THEME_PROMPT_TEXT="vim"
 
-POWERLINE_LEFT_PROMPT="scm python_venv rvm cwd"
-POWERLINE_RIGHT_PROMPT="in_vim clock battery user_info"
-
+POWERLINE_LEFT_PROMPT=${POWERLINE_LEFT_PROMPT:="scm python_venv rvm cwd"}
+POWERLINE_RIGHT_PROMPT=${POWERLINE_RIGHT_PROMPT:="in_vim clock battery user_info"}
 
 function set_rgb_color {
   if [[ "${1}" != "-" ]]; then