getting up to speed
Conflicts:
	.gitignore
Merge remote branch 'origin'

Conflicts:
	.gitignore
getting up to speed
Additional facts about cats.
Merged gitignore.
Fixed minor content error.
automerge updates
initial Opera 15+ commit
Addressed feature req #294
makefule and readme updates
Opera extension satisfies #190
bump otr
Fix up grunt deps

This should now work,

  npm install -g grunt-cli
  grunt jshint
  grunt tests
Formatting
trying again
trying again
streamlined build process for opera
Somewhat complete SMP UI, but without localization or bug testing
Merge pull request #428 from arlolra/upgrade

bump otr