fixed breaking tests on features spec
WIP: users show needs app intro. stylize app. change routes.
fix merge conflicts in header, channel show, and iframe.js
Merge pull request #45 from mule-deer-2013/styling

Styling
newspaper look style
fix data-id on links in channel show
Merge pull request #46 from mule-deer-2013/newspaper_style

Newspaper style
Merge branch 'presentation_snapshots' of https://github.com/mule-deer-2013/NewsShark into presentation_snapshots