Update Rails to 4.0.4
Add --clear to rerun
Modify bin/spring regex to make it work with listen2 branch
Remove legacy code
Refactor
Merge branch 'master' of github.com:jmuheim/base into features/user_vocabularies

Conflicts:
	Gemfile.lock