updated gitignore to remove mercurial rubbish and ignore the.deployment file to stop risk of wrong branch getting deployed!
Merge branch 'staging' into develop