Commit with changes to work on Ubuntu 15.04

* include git-completion and git-prompt files
* recolour prompt

.bashrc

@@ -44,6 +44,13 @@ alias be='bundle exec'        # bundler with options:
 alias ber='bundle exec rspec'              # rspec
 alias bec='bundle exec cucumber'           # cukes
 
+# Git specific:
+. ~/.git-completion.bash
+. ~/.git-prompt.sh
+
+export GIT_PS1_SHOWDIRTYSTATE=1
+export PS1='\[\033[36m\]\u \[\033[0;33m\]\w\[\033[0;35m\]$(__git_ps1 " (%s)")\[\e[0m\]\$ '
+
 #--------------------------------------------------------
 # Aliases around 'ls' family of commands
 #--------------------------------------------------------
@@ -88,23 +95,22 @@ PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
 # Prompt definition
 #--------------------------------------------------------
 
-PROMPT_HOSTNAME='ubuntu'
-PROMPT_HOST_COLOR='1;31m'
-PROMPT_DIR_COLOR='1;34m'
-PROMPT_DEF_COLOR='0;39m'
-ROOT_AT=''
-# If I am root, set the prompt to bright red
-if [ ${UID} -eq 0 ]; then
-PROMPT_HOST_COLOR='41m'
-PROMPT_DIR_COLOR='41m'
-ROOT_AT='root@'
-fi
-case ${TERM} in
-        vt100)
-PS1='[\u@${PROMPT_HOSTNAME}\w]\n \#\$'
-        ;;
-        *)
-PS1='[\e[${PROMPT_HOST_COLOR}\[${ROOT_AT}\h:\[\e[${PROMPT_DIR_COLOR}\]\W\[\$\e[m]\n$ '
-        ;;
-esac
+# PROMPT_HOST_COLOR='1;31m'
+# PROMPT_DIR_COLOR='1;34m'
+# PROMPT_DEF_COLOR='0;39m'
+# ROOT_AT=''
+# # If I am root, set the prompt to bright red
+# if [ ${UID} -eq 0 ]; then
+# PROMPT_HOST_COLOR='41m'
+# PROMPT_DIR_COLOR='41m'
+# ROOT_AT='root@'
+# fi
+# case ${TERM} in
+#         vt100)
+# PS1='[\u@${PROMPT_HOSTNAME}\w]\n \#\$'
+#         ;;
+#         *)
+# PS1='[\e[${PROMPT_HOST_COLOR}\[${ROOT_AT}\h:\[\e[${PROMPT_DIR_COLOR}\]\W\[\$\e[m]\n$ '
+#         ;;
+# esac
 

.config/gedit/accels

@@ -0,0 +1,55 @@
+; gedit GtkAccelMap rc-file         -*- scheme -*-
+; this file is an automated accelerator map dump
+;
+; (gtk_accel_path "<Actions>/GeditWindowAlwaysSensitiveActions/ViewToolbar" "")
+; (gtk_accel_path "<Actions>/GeditWindowActions/DocumentsPreviousDocument" "<Primary><Alt>Page_Up")
+; (gtk_accel_path "<Actions>/GeditWindowActions/EditCut" "<Primary>x")
+; (gtk_accel_path "<Actions>/GeditWindowAlwaysSensitiveActions/View" "")
+; (gtk_accel_path "<Actions>/GeditWindowActions/FileRevert" "")
+; (gtk_accel_path "<Actions>/GeditWindowActions/EditCopy" "<Primary>c")
+; (gtk_accel_path "<Actions>/GeditWindowActions/FileSaveAs" "<Primary><Shift>s")
+; (gtk_accel_path "<Actions>/GeditWindowActions/SearchGoToLine" "<Primary>i")
+; (gtk_accel_path "<Actions>/GeditWindowActions/ViewHighlightMode" "")
+; (gtk_accel_path "<Actions>/GeditWindowActions/FilePrintPreview" "<Primary><Shift>p")
+; (gtk_accel_path "<Actions>/GeditWindowAlwaysSensitiveActions/FileOpen" "<Primary>o")
+; (gtk_accel_path "<Actions>/GeditWindowAlwaysSensitiveActions/HelpContents" "F1")
+; (gtk_accel_path "<Actions>/GeditWindowAlwaysSensitiveActions/Search" "")
+; (gtk_accel_path "<Actions>/GeditWindowAlwaysSensitiveActions/HelpAbout" "")
+; (gtk_accel_path "<Actions>/GeditWindowAlwaysSensitiveActions/EditPreferences" "")
+; (gtk_accel_path "<Actions>/GeditWindowActions/FileCloseAll" "<Primary><Shift>w")
+; (gtk_accel_path "<Actions>/GeditWindowAlwaysSensitiveActions/ViewStatusbar" "")
+; (gtk_accel_path "<Actions>/GeditWindowActions/EditRedo" "<Primary><Shift>z")
+; (gtk_accel_path "<Actions>/GeditSpellPluginActions/AutoSpell" "")
+; (gtk_accel_path "<Actions>/GeditWindowActions/EditUndo" "<Primary>z")
+; (gtk_accel_path "<Actions>/GeditWindowActions/DocumentsNextTabGroup" "<Primary><Shift><Alt>Page_Down")
+; (gtk_accel_path "<Actions>/GeditWindowActions/SearchClearHighlight" "<Primary><Shift>k")
+; (gtk_accel_path "<Actions>/GeditWindowPanelsActions/ViewSidePanel" "F9")
+; (gtk_accel_path "<Actions>/GeditWindowActions/DocumentsNewTabGroup" "<Primary><Alt>n")
+; (gtk_accel_path "<Actions>/GeditWindowAlwaysSensitiveActions/Edit" "")
+; (gtk_accel_path "<Actions>/DocumentsListActions/Active_Tab_0" "<Alt>1")
+; (gtk_accel_path "<Actions>/GeditSpellPluginActions/CheckSpell" "<Shift>F7")
+; (gtk_accel_path "<Actions>/GeditSpellPluginActions/ConfigSpell" "")
+; (gtk_accel_path "<Actions>/GeditWindowActions/SearchFindNext" "<Primary>g")
+; (gtk_accel_path "<Actions>/GeditWindowAlwaysSensitiveActions/Tools" "")
+; (gtk_accel_path "<Actions>/GeditWindowAlwaysSensitiveActions/ViewFullscreen" "F11")
+; (gtk_accel_path "<Actions>/GeditTimePluginActions/InsertDateAndTime" "")
+; (gtk_accel_path "<Actions>/GeditWindowAlwaysSensitiveActions/Help" "")
+; (gtk_accel_path "<Actions>/GeditWindowAlwaysSensitiveActions/File" "")
+; (gtk_accel_path "<Actions>/GeditWindowActions/SearchReplace" "<Primary>h")
+; (gtk_accel_path "<Actions>/GeditDocinfoPluginActions/DocumentStatistics" "")
+; (gtk_accel_path "<Actions>/GeditWindowActions/DocumentsMoveToNewWindow" "")
+; (gtk_accel_path "<Actions>/GeditWindowActions/DocumentsNextDocument" "<Primary><Alt>Page_Down")
+; (gtk_accel_path "<Actions>/GeditWindowActions/DocumentsPreviousTabGroup" "<Primary><Shift><Alt>Page_Up")
+; (gtk_accel_path "<Actions>/GeditWindowAlwaysSensitiveActions/Documents" "")
+; (gtk_accel_path "<Actions>/GeditWindowActions/SearchFindPrevious" "<Primary><Shift>g")
+; (gtk_accel_path "<Actions>/GeditWindowActions/FileSave" "<Primary>s")
+; (gtk_accel_path "<Actions>/GeditWindowActions/EditDelete" "")
+; (gtk_accel_path "<Actions>/GeditWindowPanelsActions/ViewBottomPanel" "<Primary>F9")
+; (gtk_accel_path "<Actions>/GeditQuitWindowActions/FileQuit" "<Primary>q")
+; (gtk_accel_path "<Actions>/GeditCloseWindowActions/FileClose" "<Primary>w")
+; (gtk_accel_path "<Actions>/GeditWindowActions/SearchFind" "<Primary>f")
+; (gtk_accel_path "<Actions>/GeditWindowActions/FilePrint" "<Primary>p")
+; (gtk_accel_path "<Actions>/GeditWindowActions/EditPaste" "<Primary>v")
+; (gtk_accel_path "<Actions>/GeditWindowActions/EditSelectAll" "<Primary>a")
+; (gtk_accel_path "<Actions>/GeditWindowAlwaysSensitiveActions/FileNew" "<Primary>n")
+; (gtk_accel_path "<Actions>/GeditWindowActions/FileSaveAll" "<Primary><Shift>l")