Merge branches 'master' and 'casey'
added has_one and nested attributes relationship for plaintexts
fix index view to remove backbone experiment
Merge branches 'master' and 'chris'
Merge branch 'master' of https://github.com/gwillad/syllabest
added plaintext attribute permissions to component_params
Merge branches 'master' and 'chris'
changed type to component_type
Merge branch 'master' of https://github.com/gwillad/syllabest
merging from master
changed type to component_type in params
changed type to component_type in params
remove singular syllabus controller again
Merge branches 'master' and 'chris'
Merge branch 'master' of https://github.com/gwillad/syllabest
remove extraneous emacs backup file
Merge branch 'master' of https://github.com/gwillad/syllabest
added a show view for syllabuses
Merge branches 'master' and 'chris'
Merge branch 'master' of https://github.com/gwillad/syllabest