Full specification of dependency versions in tox.ini, update the list of envs
Make tox actually run tests
BeautifulSoup is also a dependency of the testsuite
Add tox configuration for running the testsuite with the upcoming Django 1.6
(Partial?) Fix ensure_completely_loaded, testsuite passes with Django 1.4, 1.5, 1.6
Also add a tox.ini section for running the testsuite with Django@master
Merge branch 'master' into next

* master:
  Also add a tox.ini section for running the testsuite with Django@master
  (Partial?) Fix ensure_completely_loaded, testsuite passes with Django 1.4, 1.5, 1.6
  Add tox configuration for running the testsuite with the upcoming Django 1.6
  BeautifulSoup is also a dependency of the testsuite
  Make tox actually run tests
  Full specification of dependency versions in tox.ini, update the list of envs

Conflicts:
	feincms/tests/cms_tests.py
	feincms/tests/page_tests.py
	feincms/tests/test_cms.py
	feincms/tests/test_page.py
	feincms/tests/test_stuff.py
	feincms/tests/tests.py
	tests/testapp/models.py
	tests/testapp/tests/__init__.py
	tests/testapp/tests/cms_tests.py
	tests/testapp/tests/page_tests.py
	tests/testapp/tests/tests.py
	tests/tox.ini
refactor tests so extensions are not loaded by default
add extensions test
Use `static` templatetag rather than `STATIC_URL`

This allows us to use the CachedStaticFilesStorage which gives unique
names for each version of a static file.
Merge branch 'next-staticfiles-support' of git://github.com/evansd/feincms into next

* 'next-staticfiles-support' of git://github.com/evansd/feincms:
  Use `static` templatetag rather than `STATIC_URL`
Merge branch 'next' into tabbed_options

* next:
  Use `static` templatetag rather than `STATIC_URL`
  add extensions test
  refactor tests so extensions are not loaded by default
  Also add a tox.ini section for running the testsuite with Django@master
  (Partial?) Fix ensure_completely_loaded, testsuite passes with Django 1.4, 1.5, 1.6
  Add tox configuration for running the testsuite with the upcoming Django 1.6
  BeautifulSoup is also a dependency of the testsuite
  Make tox actually run tests
  Full specification of dependency versions in tox.ini, update the list of envs