cleaning up extra JS/CSS
Merge remote-tracking branch 'upstream/master'
minor fixes to assets, calendar, login, page rendering
Merge pull request #448 from jessevondoom/master

more stuff — cleanup, fixes, etc.