Merge pull request #173 from tochman/develop

Fix for banners on landing page
fix for internal server error
Merge pull request #176 from yggie/develop

quick fix for internal server error
Merge pull request #179 from tochman/develop

Updates to landing page
OK, jasmine can't see my tests
i give up, specs still stuck at 0
EVERYTHING LOADS NOW
do we ever need #main_header's margin-bottom to be anything other than 0?
time to spec the css changes
Setting up jasmine spec for scroll testing
checking css on scroll
all specs passing
fixed bug in affix behaviour
Merge pull request #181 from johnnymo87/jasmine

Jasmine specs for navbar affix
merge with upstream
compiled assets