remove dupe config from .inputrc (compare lines 7-8)
Merge pull request #55 from atdt/patch-1

.inputrc: Remove duplicate `show-all-if-ambiguous` setting
Icon size of 48 pixels for dock items
Fix error thrown when Reseting Launchpad in some conditions

When multiple *.db files existed in ~/Library/Application Support/Dock/ ,
[ -e ~/Library/Application\ Support/Dock/*.db ] would throw an error.
Merge pull request #59 from aristidesfl/patch-1

.osx: Fix error thrown when resetting Launchpad in some conditions

Fixes #56.
adding screenshot location and file format
Merge pull request #61 from ekinertac/master

.osx: Screenshot location and file format settings
.osx: Clean up after commit 5b36bee8676dc8e800f68e3a559e102dcefcae36
Merge pull request #57 from nurtext/patch-1

.osx: Set Dock icon size
.osx: Set the icon size of Dock items to 36 pixels
Comment out change of "Open windows on startup", OSX 10.7.4 introduces this by default
Merge pull request #62 from richo/patch-1

.osx: Disable the “disable reopen windows when logging back in” option by default now that OS X 10.7.4 fixes it
.osx: Remove the “disable reopen windows when logging back in” command

This behavior was fixed in OS X 10.7.4, and the previous solution was a hack anyway.
Maximum set volume is 7, not 10

See:
http://docs.info.apple.com/article.html?path=AppleScript/2.1/en/as213.ht
ml
Merge pull request #63 from Alex-Humphreys/master

.aliases: Make `pumpitup` set the volume to `7`, not `10`
.aliases: Make `ips` show IPv6 addresses as well
.gitconfig: Add `credit` alias to quickly change the author of the latest commit

Inspired by @holman’s https://github.com/holman/dotfiles/blob/master/bin/git-credit.
Update .inputrc
Merge pull request #67 from nikolavp/patch-1

Remove one of the configs
.functions: Add `gz` function to get gzipped file size