Make sure that we never accidentally submit the password
Merge old dev stuff back into master
Add in swap files to the gitignore
Try to keep the todo stuff more up to date