Basic clean up for starters
Added meaningful names for database.yml.example and reverted schema file
Modified name changes in .sql
Add back the ctags
Protect against nil current_user
Merge branch 'master' of https://github.com/expertiza/expertiza into rails4

Conflicts:
	Gemfile
	Gemfile.lock