Add Teaspoon for javascript specs
Append tespoon to the default rake task
Merge branch 'master' into redesign
Several TimeBar specs and very basic implementation
Merge remote-tracking branch 'origin/redesign' into redesign

Conflicts:
	Gemfile.lock