Fix a variety of typos.
Merge pull request #5 from jonatkins/master

Pull from upstream.
Merge pull request #6 from nexushoratio/master

Pull from upstream.
Merge branch 'to-push' of github.com:nexushoratio/ingress-intel-total-conversion into to-push

Conflicts:
	plugins/portal-defense.user.js
	plugins/show-linked-portals.user.js
Fix bad merge from upstream (git novice in action).
Merge pull request #672 from nexushoratio/to-push

To push