Refactoring code to make it cleaner. Fixing bug to filter out Roslyn ass...

...emblies.

Also updating to Web API 2.0 from RC.