Merge branch 'master' of git://github.com/TonyXie/TumblrTime

Conflicts:
	popup.js
Merge branch 'master' of git://github.com/TonyXie/TumblrTime

Conflicts:
	popup.js
popup.js ajax stuff