Changes from NULL to null etc
More cleanup for null and docblock
Remove unwanted js file
Merge pull request #171 from findsorguk/fixingProblems

Fixing problems