Merge branch 'hotfix/fix_snp_link'
started changes to match snps to exons
a more permanent fix for the Mac jre 1.7.  Will need to remove all the code once the bug is fixed.
updated .gitignore to ignore the new path to the ensembl API(s)
Merge branch 'hotfix/fix_mac_java' into develop

Conflicts:
	gene.jsp
	geneResults.jsp