Remove possibly unfree file cyder.gif
Remove possibly unfree file cyder.gif: Part II
changed department field for systems to not be required
Merge branch 'master' into dev
Merge pull request #16 from drkitty/dev

Remove possibly nonfree file cyder.gif
Remove duplicate MIGRATION_* definitions
Remove null=True from CharFields, TextFields, ...

... and EmailField

Conflicts:
	cyder/core/system/models.py
Join short lines
Add schema migrations for e3cf392
Duplicate systems no longer cause test1_delete_basic to fail incorrectly.
pep 8 editing
Merge pull request #25 from church29/pep8edit

pep 8 editing
excluded users from ctnr form
Merge pull request #23 from drkitty/removenull2

I've tested these changes and found that it created no new errors. I'm approving this pull request for merge.
Test details:
```
< FAILED (errors=99, failures=215)
---
> FAILED (errors=77, failures=223)
```
Merge pull request #26 from church29/m2mfix

CtnrViewTests - Cannot set values on m2m field with intermediary model
Merge pull request #14 from murrown/master

refactored txt bind formating to handle multiple line txt records