Extra ember library, verified tests

Conflicts:
	static/global/js/vendor/ember-data-drf2-adapter.js
Fixed an issue causing BlueBottleTestSuite to be imported in regular non-core bb projects, causing ImportError on setuptest

Conflicts:
	bluebottle/tests/__init__.py
	setup.py
Added a serializer capable of providing metadata to Ember
removed test database
Pull upstream & resolve conflicts
resolve conflicts
Merge branch 'master' of github.com:maykinmedia/bluebottle into meta-seo-2
Refactoring meta data, TODO: check app.js and ember-meta.js, make sure they function for tests
Test files modified to incorporate Meta-data and ember-meta
Try to fix tests import
Forgot dependency...
Tests...
Fixed issue with ember-meta and undefined object. Disable Python 2.6 tests, causing importerrors with setuptest 0.1.4
Reverted back to different import format, preventing tests to be run in onepercentclub-site
Slightly modified serializers to be a bit more flexible
Merge branch 'meta-seo-2' of github.com:maykinmedia/bluebottle into mayking-meta

Conflicts:
	bluebottle/common/templates/bluebottle/base.html
Merge pull request #25 from gannetson/mayking-meta

Mayking meta
Merge branch 'master' of github.com:onepercentclub/bluebottle