Merge remote-tracking branch 'gerry/nclusion' into nclusion
all tests passing on nclusion but probably lots to do still
process inclusion cleanup
fixed some blatant n-depth problems
got new inclusion stuff working across ajax calls
got rid of debugging code in coffee
Merge branch 'develop' into nclusion
cleanup of nclusion changes
touched up search and pointer item behavior
cleaning up lib test organization
wiped old assets away
re-precompiled assets
fixed item_type bug
Merge remote branch 'wagn/develop' into develop