Merge pull request #13 from ljwolford/setup

Setup
added framework views and stuff
removed my debugging
adding performance framework views
more with performance frameworks
Merge pull request #14 from creighton/compui

Compui
 starting comp editing
edit comps
fix merge
edit competency working
changed resets to posts and added buttons for that to home page
putting in current mess for peer assistance
fixed url validator in forms
removed bad code
Merge pull request #16 from creighton/convert

Convert
merged master