Merge branch 'master' of github.com:cbeach/Configurations
Lowered bash history size, added smarter searching