removed config director
corrected routes.rb path
corrected migration table name
solved the mouseover problem in the watch feature
and renamed it follow feature
fix codename resetting
Merge branch 'master' into 1.14.1
ticked up db/version.txt
Fix some tests, update some gems in gemspec
Merge remote-tracking branch 'gerry/fix_some_tests'
back to 3.2.16
Merge branch 'master' into engine

Conflicts:
	Rakefile