Add base feed collection models
Commit from Mozilla Verbatim by user auzelac91.: 1268 of 2491 strings translated (0 fuzzy).
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Commit from Mozilla Verbatim by user ibai@oihanguren.com.: 912 of 2491 strings translated (10 fuzzy).
remove the need for a settings_local.py file in dev (bug 999774)
Merge pull request #2110 from andymckay/999774

remove the need for a settings_local.py file in dev (bug 999774)
limit to only mkt and lib
ensure SESSION_COOKIE_SECURE is not False
override stylus bin as well on prod servers
override lessc bin as well on prod servers
move Contribution etc into mkt.purchase (bug 999098)
Merge pull request #2107 from washort/999098

move Contribution etc into mkt.purchase (bug 999098)
use the right settings file
remove old update files
Updated test to use nose.cfg and run mkt,lib tests
Merge pull request #2131 from andymckay/settings

remove old update files
add in landfill settings and don't validate test suite settings