update to make work with new tiddlywebwiki

* refer to store_contents in a more traditional fashion
  (use the package resources, not the original locations)
* remove support for friendlywiki, since we already have friendly
  tiddlers and per domain friendly wikis
Merge pull request #1028 from colmjude/master

Add accept attr to icon upload
Change help link in GettingStarted

Make it so it is an actual URI, so that people using
GettingStarted on their own tiddlyspaces will go somewhere
moderately useful when clicking on help.

This aligns with what is done in the backstage.
release 1.1.40

* update for modern tiddlyweb and tiddlywebwiki
* _store and _account icon upload improvements
* change help link in GettingStarted
transform to work with imaker and ibuilder

This is mostly config and test changes. The test changes
related to no longer needing to worry about the chdir inside
spawn.
release 1.2.0

* Use imaker and ibuilder for instance management.
Fix config merges

Without the second merge_config, twanager update doesn't know
the right packages in which to look for pgkstores: tiddlywebwiki
has reset the config setting to something of its own.

Unfortunately the two merges are required because the config needs
to perform two jobs:

* telling various included plugins how to behave
* telling _this_ plugin/instance how to behave
Resize iframe to actual size of contained window, uses postMessage
Safer to use id selector than impact all iframes on page.

Re pmario comments

Conflicts:
	src/apps/backstage.js.js
Use height of html element not document

html element height = height of content
doc height = height of iframe if set
Merge pull request #1030 from colmjude/resizebs

Resize iframe to actual size of contained window, uses postMessage
release 1.2.1

* better iframe size handling in the backstage
require module version

pyparsing 2 is for python3
markdown 2.3 and beyond targets python 2.6 and beyond

So, while tiddlyspace targets 2.5, this is what we've got.
Badly need to change this.
Mention the correct make target to get PhantomJS
Merge branch 'master' of github.com:TiddlySpace/tiddlyspace
Include TidddlyFileImporter locallly, annotate about inclusion

The plugin depends on tiddlyspace so may as well be local.

In the process annotate the URL form field with a reference
to inclusion. See:

  https://github.com/bengillies/tiddlyweb-client-plugins/pull/6

which was done shortly before moving the code into this repo.
fix missing status variable declaration in setBag.
setBag: refreshIcon(status) needs to be valid. FireFox 20 caused a problem
Merge pull request #1034 from pmario/fix-ToggleTiddlerPrivacyPlugin

fix missing status variable declaration in setBag.
rename status variables to tiddlerStatus and bagStatus

using the irrefutable logic of: if my editor colors the
variable name as a keyword, then I shouldn't use this as
a variable name.
some jslint cleanups to a recently bugfixed tiddlywiki plugin

This certainly doesn't get all the issues, but tidies things
up a bit. Due to TiddlyWiki's use of lots of globals it's never
gonna be complete.

We should probably do this on most of the plugins. If we had the
problem that was fixed by 2f6413b73d76a529c15b22cc666bcc41491af39e
would have been found by linting.