Merge branch 'bug6-search'
Merge remote-tracking branch 'upstream/master'
Merge pull request #41 from tony-o/master

re-adding unicode support without quote and quote_plus
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
Adjusted contributing.rst with link to travis + new feature and thoughts
about ocr.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into contrib-updates
Merge pull request #44 from erickr/contrib-updates

Updated to docs/contributing.rst
getting ready for 0.1.0!
bootstrappifying and cleaning up UI, will look good on a mobile phone