latest version of github's stylus has a problem with @import '*'. Changes reflect that. And small nav tweaks
had to make changes b/c latest build of grunt stylus has a problem with imports
Merge branch 'master' of https://github.com/paceaux/CMSPutty

github says I'm out of sync