Merge branch 'reformating_projects' of github.com:jdalphon/rSENSE into reformating_projects
Closing an a tag that was screwing everything up
Merge pull request #1241 from jdalphon/reformating_projects

Updating projects edit page.
-Fixed contribute key creation errors to be readable.
Merge pull request #1246 from mmcguinn/mm1123

-Fixed contribute key creation errors to be readable.
Trying to fix merge confict
Merge branch 'master' of git://github.com/isenseDev/rSENSE into default_vis
Trying to fix a merge conflict