Merge pull request #13 from DelvarWorld/onresource

Enabling onResouceRequested and onResourceReceived events (Issue #12)
Merge pull request #14 from DelvarWorld/injectjs

Enabling injectJs + a test
Merge pull request #17 from DelvarWorld/mouseFix

Your entire codebase is built on a web of lies
Merge pull request #21 from DelvarWorld/insanity

Fixing all events. What is going on with this library?!
Merge branch 'realevents' of git://github.com/DelvarWorld/phantom-proxy into DelvarWorld-realevents

Conflicts:
	lib/webpage.js
fix issue #20, remove alerts code, give attribution to node-phantom for socket.io impl.
Enabling injectJs + a test
Event object uses event as documented, not type

Part of a small erroneous merge issue in ad6647c9 < should have been in
there
Merge pull request #24 from DelvarWorld/eventargs

Event object uses event as documented, not type
Merge pull request #23 from DelvarWorld/inject2

Enabling injectJs + a test
0.1.77
0.1.78
Implementing page.settings.set and page.settings.get

Currently you can set the page **properties** but not the page
**settings**. This patch allows you to do so. Note this does NOT allow
for setting multiple page settings at once. It would be more work, and
this is in line with how page.set works anyway
Merge pull request #27 from DelvarWorld/pset

Implementing page.settings.set and page.settings.get
Merge branch 'pset' into mymerges