Merge pull request #163 from uidaho-bsn/pierce-dev

Pierce dev merging into dev for deployment to Heroku through master
Merge pull request #164 from uidaho-bsn/dev

Dev into Master, @rsacksteder approves
uncommented database update lines for deployment to Heroku
re-commented database update lines, pushing to Heroku
trying the database update again
Fixed some table headings, fixed forgot password page (issue #157)
commented out database update lines, as this has already been performed on the Heroku site
fixed some table headers and alignment
Fixed order of pretty_note_tone display from accidental/note/octave to note/accidental/octave in all fingerings table per susan's request, also fixed this, as well as alignment issues on note/fingerings canvas. Also fixed alignment of accidentals with note heads on canvas
Merge branch 'master' into pierce-dev

getting changes made to local master branch when deploying to Heroku recently