Enabled infinite bash history
.xinitrc - Start pulse on Ogre
.alias - Added synergy restart alias
.alias - Added git aliases normally provided by oh-my-zsh
.bashrc - exported PATH and GOPATH
Misc changes

.bashrc - Added note about Skype
.tmux.conf - changed right status bar length and fixed config
.vim - updated pointer?
.xinitrc - misc fixes for Ogre
Merge remote-tracking branch 'origin/master'

Conflicts:
	.vim

Merging with remote master to fix this issue:
 Your branch and 'origin/master' have diverged,
 and have 6 and 10 different commits each, respectively.
Resync
Merge branch 'master' of git+ssh://github.com/frostyfrog/dotfiles

Conflicts:
	fresharch