add pycharm config dir and optional data dir to .gitignore
add requirements.txt

note, currently specifies Django 1.3.7, may need other review
Merge branch 'master' of github.com:knabar/fynbos
Merge branch 'master' of https://github.com/cit-jmu/rooibos

Conflicts:
	.gitignore
	requirements.txt
added an admin interface for presentations, allowing sorting by most fields and search by title/name
added an admin interface for presentations, allowing sorting by most fields and search by title/name
Merge branch 'more_admin_py' of github.com:hanleybrand/rooibos into more_admin_py

Conflicts:
	rooibos/presentation/admin.py
Merge pull request #32 from hanleybrand/more_admin_py

Presentations, now with admin py