add tmp.html to test phantomjs promise
add vendor/promise
Merge branch 'gh-pages' into new

Conflicts:
	vendor/promise-6.0.0.min.js