Merge pull request #56 from FCStrike/master

Update templates + various bugfixes
Merge pull request #57 from FCStrike/master

Update mocks, crosslink resources
Prelim opp detail view
Change mock data for opportunities to include more details
Merge pull request #58 from willwclo/moar-mocks

Moar mocks
Merge pull request #59 from FCStrike/master

Add update functionality on admin.companies.detail page
Resolve merge conflict