removed bloomconfig, added a .gitignore to not track .pyc files
removed settings.conf and organizers.pyc
cleaned up practice code
More than annoyed with git
updated the web server quite abit
Merge branch 'master' of https://bitbucket.org/paarth/bloom

Conflicts:
	bloom.db
added /image/# functionality which lists tags
basic image uploading now works
Merging features from db_code branch into master.
Merge branch 'master' of https://bitbucket.org/paarth/bloom
image thumbnails working (requires imagemagick), multi-file uploads now supported
Merge branch 'master' of https://bitbucket.org/paarth/bloom
set operators and parenthesis for OOP overriding work. Desperate need of refactoring
tags page now displays the number of images that each tag is applied to
Trivial shit
Trying to find out how to merge changes from side branches.
Updated settings.json and inserted sketch of functions into server.py (from meetings with Paarth).
General progress update. ~70% done with Lexical Parser.
Serious progress on lexical_parser.
Finished a working draft of lexical_parser.py.