Merge pull request #3 from circuitfox/experimental

Merge several code-quality changes from experimental to master
Minor Makefile and .gitignore changes
Merge pull request #7 from circuitfox/master

Merge makefile and gitignore changes into experimental