Merge done
merged master
Added ability to edit publications
merge conflicts
Added cucumber tests for show page
Added initial cucumber tests for edit page
Moved keyword logic into keyword model + one failing cucumber test
Fixed submit tag and cucumber test
Added more tests
Added tests for email+phone save
Changed input tag to textarea for publications
Changed css styles for publications and cleaned up redundant tags
Modified publication to have 2 rows
Added fixture for ppublications
Modified keywords to accept textarea tag
Finished BDD testing
Finished TDD testing
merged with master