edited .gitignore to ignore the .deployment file to stop risk of wrong branch getting deployed!
updated .gitignore to remove mercurial rubbish
Merge branch 'staging'
fixing .deployment file AGAIN!
removed .deployment from .gitignore - doesn't work on versioned files - using update-index assume-unchanged instead
fixing .deployment file AGAIN!