Merge branch 'patch-1' of git://github.com/milokowic/faker into milokowic-patch-1
Merge branch 'master' of git://github.com/jacinda/faker into jacinda-master
Merge branch 'master' of git://github.com/TRManderson/faker into TRManderson-master
Merge branch 'patch-1' of git://github.com/EvanHahn/faker into EvanHahn-patch-1
Merge branch 'master' of git://github.com/gitaristby/faker into gitaristby-master
refactored weighted elements on `NumPy`'s image to allow probability distributions with floats
Merge branch 'refs/heads/master' into feature/distributions
update docstring for random_element
fixed py3k compat
ordered imports as per PEP8
random seed is set globally.
assume python's `bisect.bisect_right` is already tested
better memory management
fixed typo
added missing encoding info
added utility function to merge dicts
Apply PEP8 to (most of) documentor.py
added shim for python 2.6
Merge branch 'refs/heads/master' into feature/distributions

Conflicts:
	faker/tests/__init__.py
added tests for Counter shim