Changed some of the defaults in .osx to my liking
Merge branch 'master' of https://github.com/m1z0/dotfiles-1

* 'master' of https://github.com/m1z0/dotfiles-1:
  Added custom aliases to pull/fetch/show status of my submodules Removed the ls command from HISTIGNORE Tweaked the .osx file more to my liking Made bootstrap.sh to ignore the .gitconfig file. I merge this by hand
  .functions: Print trailing newlines when not piping the output
  .bash_profile: Autocomplete Grunt commands