added backup files to gitignore
Merge pull request #29 from omouse/master

added backup files to gitignore
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Added tzoffset to conditions serializer #52
Added cloud_type to Condition #44
Added unix timestamp converstion to since_last_call #42
Merge branch 'develop'
Merge branch 'develop' into s3
Merge branch 'master' into s3