Fixed api token generation.
Merge pull request #643 from alexkalderimis/hf642

Fixed api token generation.
adjust some path issues
fixes #614
Fixes #664. This makes sure that python code is actually correct
Fixed a perl test while I was there
Merge pull request #665 from alexkalderimis/664-python-code-gen

664 python code gen
Merge branch 'master' of github.com:intermine/intermine into beta
Merge branch 'beta' of github.com:intermine/intermine into beta
checkstyle
Refs #625
Merge pull request #673 from intermine/i625

Struts config clean up Refs #625
Merge branch 'beta' into 614

Conflicts:
	modmine/webapp/src/org/modmine/web/ModMineSearch.java
eclipse config
Merge pull request #660 from intermine/614

614
Merge branch 'beta' of github.com:alexkalderimis/intermine into beta
Merge branch 'beta' into annotated-model

Conflicts:
	intermine/objectstore/main/.classpath
Fixed sql-generator test