updated to git 2.0 or something
Merge branch 'master' of https://github.com/naggie/dotfiles

Conflicts:
	home/.gitconfig
new pubkeys
Merge branch 'master' of git://github.com/naggie/dotfiles
Update .bashrc
Merge branch 'master' of https://github.com/naggie/dotfiles
Merge branch 'master' of github.com:naggie/dotfiles
Merge pull request #7 from naggie/master

OMG MOAR SEA CREATURES!
added jimjibone install scripts
Merge branch 'master' of github.com:naggie/dotfiles
Merge github.com:jimjibone/dotfiles