adding yml to files to moved through django template engine
adding htmlcov to gitignore
Adding vim swp files to the gitignore
versioning
Merge branch 'release/r.1'