Commented out offending lines in init.el.
Different theme load methods depending on emacs version.
Corrected the if for checking emacs version (for theme).
Merge branch 'emacs24'