"Change DateField options to correct format; add photoalbum to "
Added sublime project files to gitignore. Pulled from models branch
Added code from Cris' repo
Fixed conflicts