Use fivemat as default rspec formatter.
Add awesome nested set gem for category heirachy
add awesome nested set fields to the category model
refactor category view partial
change seed data to have nested categories
add basic edit and update actions to category controller
use new in category create action
add edit view for categories
update_parent action in categories controller
category update action tidy up
create category_parent controller to handle updating category parents
Merge pull request #2 from xaviershay/fivemat

Use fivemat as default rspec formatter.
Merge branch 'master' into xavier/bits-and-pieces

Conflicts:
	Gemfile