JSP highlighting/code suggestions not working

I have been using the community edition for a while and recently upgraded to the ultimate edition to work on a jsp project.

I am having trouble setting jsp up correctly, If I open an existing jsp file it is basically treated as text. I would like highlighting and code suggestions in a similar way to working on a java project.

When I go to create a new project, or a new file within an existing java project, I do not see JSP file as one of the options. How do I add this?  I am using Intellij IDEA Ultimate 13.1.4

Thanks for your help.