ignore swp files
added alternate tests
Merge branch 'master' of github.com:edwelker/functional_web_tests
merged with work stuff (decorator_test attempt)