initial try at keeping comments
fixing Python 3 issues
fixing 2.6 issues
fixing more 3.4 issues
Merge branch 'master' into write_comments

Conflicts:
	lib/persistent_pineapple/_json.py
	lib/persistent_pineapple/tests/test1.json
Merge branch 'write_comments'