Fixed bug in theme cascade function and split out contact js into separate file

Conflicts:
	themes/classic/js/script.js
Tweaked vimrc
Merge pull request #72 from FelixOnline/theme_branch_cherry_pick

Theme branch cherry pick