ENH: Have pivot and pivot_table take similar arguments
Merge branch 'fix5505' of https://github.com/jsexauer/pandas into fix5505

Conflicts:
	pandas/tools/pivot.py
	pandas/tools/tests/test_pivot.py