Added "Disable flow control" to bashrc
Changed color of tmux-active-border-fg
Merge branch 'master' of https://github.com/johan-carlsson/dotfiles
Fixed path to tmux-colors-solarized
Merge branch 'master' into powerline

Conflicts:
	tmux/tmux.conf
Removed seconds from powerline uptime in tmux
Removed date and time from powerline/tmux
Updated powerline install instructions