Adjusted curlrc timeout
Updated submodules (evil submodules)
password generator function
Removed some waste
updates I just don't remember what
Merge branch 'master' of https://github.com/heychris/dotfiles

Conflicts:
	.gitmodules
Why?