Added new time format string: o
o – the ISO 8601 year number
https://docs.djangoproject.com/en/dev/releases/1.4/#two-new-date-format-strings
removed remarked out junk
removed swap file
fixed indentation
removed exports used for manual testing
removed unimplemented '$e' tag
Merge pull request #95 from dgulino/master

New time format string 'o' – the ISO 8601 year number