stage 1 changes, wait to be merged
skills fix
finally merged
Merge branch 'k1/cleanup' of github.com:TheArchitects/Spillio into k1/cleanup

Conflicts:
	app/models/skill.rb
	app/models/user.rb