Merge alex-ubuntu-server configs

Conflicts:
	.bash_logout
	.bash_profile
	.bashrc
	.profile

.bash_aliases

@@ -4,4 +4,4 @@
 
 # Aliases for maintinence
 alias upgradepackages='maintenence'
-alias updatepackages='maintenence'
+alias updatepackages='maintenence'

.bash_logout

@@ -6,4 +6,4 @@ if [ "$SHLVL" = 1 ]; then
     [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q
 fi
 
-echo "bye"
+echo "bye"

.bash_profile

@@ -6,14 +6,10 @@ echo -e "\nYou've succesfully connected to the system.\nIdeally, you would keep
 export PATH=$PATH:~/bin
 
 # Add .bashrc stuff
-if [ -f ~/.bashrc ]; then
-    . ~/.bashrc
-fi
+[[ -f ~/.bashrc ]] && . ~/.bashrc
 
-export PAGER=less
-export BROWSER=lynx
-export EDITOR=nano
-export VISUAL=emacs
+# this includes env variables
+[[ -f ~/.profile ]] && . ~/.profile
 
 #_byobu_sourced=1 . /usr/bin/byobu-launch -S byobu
-byobu -R -S byobu;exit
+byobu -R -S byobu;exit

.bashrc

@@ -1,4 +1,4 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
+# ubuntu ~/.bashrc: executed by bash(1) for non-login shells.
 # see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
 # for examples
 
@@ -101,3 +101,13 @@ fi
 if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
     . /etc/bash_completion
 fi
+
+#
+# arch default ~/.bashrc
+#
+
+# If not running interactively, don't do anything
+[[ $- != *i* ]] && return
+
+alias ls='ls --color=auto'
+PS1='[\u@\h \W]\$ '