some tweaks to prompts git and alias
added vimrc
added a couple alias for padrino
hide show desktop items
updated git ignore
spelling error
Merge branch 'master' of github.com:elianderson/dotfiles

* 'master' of github.com:elianderson/dotfiles:
  updated git ignore
added auto complete and some other aliases
added st in git
added shotty
added schema.rb
nothing
my git shit
Updating dotfiles
Making dotfiles consistent on all my machines
Merge branch 'jeremy'

* jeremy:
  Updating dotfiles Making dotfiles consistent on all my machines
  my git shit
  nothing
  added schema.rb
  added shotty
  added st in git
  added auto complete and some other aliases
  spelling error
  updated git ignore
  hide show desktop items
  added a couple alias for padrino
  added vimrc
  some tweaks to prompts git and alias

Conflicts:
	.aliases
	.bash_profile
	.bash_prompt
	.exports
	.functions
	.gitconfig
	.gitignore
	.vimrc