Make Timestamp('now') equivalent to Timestamp.now() and Timestamp('today') equivalent to Timestamp.today() and pass tz to today().
Merge branch 'timestamp-now' of https://github.com/rockg/pandas into rockg-timestamp-now

Conflicts:
	doc/source/whatsnew/v0.15.2.txt