made note edit form a modal, formatted it
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
removed redundant javascript that was breaking editing in place and menu
merge conflict
bug fix from last commit
Merge pull request #129 from dheckman/master

made note edit form a modal, formatted it, removed redundant js that was breaking editing in place and menu bar