Fixes, organization, naming conventions
Merge branch 'master' of github.com:mburgs/asana