Minor stylistic changes
tweaking ls alias for unix systems
Tweaking .gitignore. Ignoring derived/compiled objects in the global ignore is probably silly
Removing Icon? declaration in .gitignore, it's too general
Dropped some useless functions
Setting push.default to simple
Adding LS_COLORS to exports
Tweaking aliases
Changing how .personal works
Removing debug echo
Noodling with \[[36m\]\u\[[37m\]@\[[36m\]\h\[[37m\]:\[[36m\]\w\[[33m\]$([[ -n $(git branch 2> /dev/null) ]] && echo ">")$(parse_git_branch)\[[37m\]\n\$ \[(B[m\]
Noodling with PS1
Merge branch 'master' of github.com:jedrichards/dotfiles
Noodling with PS1
Merge branch 'master' of github.com:jedrichards/dotfiles

# By jedrichards (10) and Jed Richards (3)
# Via jedrichards
* 'master' of github.com:jedrichards/dotfiles:
  Noodling with PS1
  Noodling with PS1
  Noodling with \[[36m\]\u\[[37m\]@\[[36m\]\h\[[37m\]:\[[36m\]\w\[[33m\]$([[ -n $(git branch 2> /dev/null) ]] && echo ">")$(parse_git_branch)\[[37m\]\n\$ \[(B[m\]
  Removing debug echo
  Changing how .personal works
  Tweaking aliases
  Adding LS_COLORS to exports
  Setting push.default to simple
  Dropped some useless functions
  Removing Icon? declaration in .gitignore, it's too general
  Tweaking .gitignore. Ignoring derived/compiled objects in the global ignore is probably silly
  tweaking ls alias for unix systems
  Minor stylistic changes

Conflicts:
	.aliases
	.exports
	.functions
	.osx
Typo
Change jedbook to mikebook