Change default indentation level to 2

This gives us compatibility with Monodevelop and Visual Studio
Merge remote-tracking branch 'origin' into intellisense
Merge remote-tracking branch 'origin/intellisense' into intellisense
Fix bug by standardising all filename to be quoted
Update help text