Tagging changes

Refactor the controller code for assigning skills to a company. Also merge and refactor some of the acceptance tests for creating a company.