Merge pull request #45 from ddworken/master

Added wifijammer integration (and many small fixes)
improved router IP finding function
better interface detection if not specified
typo
Merge pull request #2 from DanMcInerney/master

Update dev. fork