Merge pull request #78 from digitalcake/develop

Refactored User Spec
ugh, a collection of stuff, including pobox orgs that were missed, setting new relic logging to info and some notes for Marcelo in cucumber feature
ignoring Vagrantfile
refactored infinite scroll tests
refactor infinite scroll
fixing search to avoid old style infinite scroll
Added 'all' marker for default all cats along with spec; swapped category and search boxes per client request
needed to remove noscript and scrolling-js to properly lose the old scrolling system
Merge branch 'master' of https://github.com/tansaku/LocalSupport into cat_swap
Merge pull request #79 from mtc2013/cat_swap

Cat swap
simplifying the category/search layout
Merge pull request #1 from tansaku/master

Pull from Parent Fork