re-adding unicode support without quote and quote_plus
fixing note_name display in front end
fixing note_name display in front end
Merge remote-tracking branch 'upstream/master'

Conflicts:
	tests/test_basics.py
	tests/test_notes.py
univision
Merge pull request #41 from tony-o/master

re-adding unicode support without quote and quote_plus
fixing unicode decode to use chr instead of unichr since were not encoding unicode chars
base notes; starring; i flash my high beams; you showed me your blinkers;
Merge branch 'master' of https://github.com/tony-o/magpie into tony-o-master
making more fixes to PR #43
Merge branch 'tony-o-master'
making it easier to test stuff by allowing config files to be in the dir you run magpie from
making the cookies last longer than the session
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into contrib-updates