Merge pull request #10 from AgileVentures/develop

Merging to staging
Merge pull request #21 from AgileVentures/develop

First CD to Staging
Merge pull request #26 from AgileVentures/develop

Merging content and Ace editor from Develop
Merge pull request #31 from yggie/develop

Develop
Merge pull request #32 from AgileVentures/develop

Migrating changes from Develop to Staging server
commented out about page content
Merge pull request #33 from PeteBoucher/staging

commented out about page content, awaiting new content and developer profiles
stripped out about page feature
Merge pull request #34 from PeteBoucher/staging

stripped out about page feature
and the spec
Merge pull request #35 from PeteBoucher/staging

commented out the view spec for the removed page content
about page layout and content
Vivs revised text
avatar cols
implemented some form of sticky footer
Merge remote-tracking branch 'pete/about' into about

* pete/about:
  avatar cols
  Vivs revised text
reformated the avatars on 'about us' to bootstrap media-type and hard coded some of the pix rather then using gravatar omages
refactored features and specs. Added views/application spec
Merge pull request #37 from tochman/develop

Client prep #1, looks all good on my end, good work on the avatars!
new CTA illustrations