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