Bug 1108785 - Setup Travis for package test suite
Bug 1110627 - Update the README to use markdown
Bug 1108785 skipping ui button modules test when run from jpm suite
Merge branch 'master' of https://github.com/mozilla/addon-sdk into 1108785

Conflicts:
	bin/jpm-test.js
Bug 1108785 using a smaller invalid add-on for testing addon/installer
Bug 1108785 skipping window tests on travis
Bug 1108785 correction to self module for case where @loader/options name is undefined
Merge pull request #1748 from erikvold/1108785

Bug 1108785 - Setup Travis for package test suite r=@gozala
Bug 1108785 bug fix - TypeError: property testBug682681_aboutURI is non-configurable and can't be deleted a=me
Bug 1108785 bug fix - TypeError: property testOpenAndCloseWindow is non-configurable and can't be deleted a=me
Bug 1108785 bug fix - ReferenceError: can't access lexical declaration  before initialization a=me
Merge pull request #1749 from erikvold/readme-md

Bug 1110627 - Update the README to use markdown r=@gozala
Adding travis button to README.md a=me
Merge remote-tracking branch 'upstream/master'