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

note, currently specifies Django 1.3.7, may need other review
Update record name whenever DC identifier is set on that record
Update media name whenever url property is changed
Make sure record names are set on fields equivalent to dc.identifier
Add name reset commands for records and media
Merge branch 'master' of github.com:knabar/fynbos
Merge branch 'master' of https://github.com/cit-jmu/rooibos

Conflicts:
	.gitignore
	requirements.txt
Add missing space in presentation properties HTML
Disable cloudfiles storage system
Remove print statement
Start work on shared collections
Expand returned field information in record json
Fix wrong name in Flickr library
Initial working shared collections
Break up query for better performance in SQL Server
Add shared collection management UI
Base searches on configured shared collections
Fix bug when packaging slideshow and a record has no title
Add test to verify packaged images respect image size restrictions