Initial cleanup
Added .gitignore files
Merged changes
Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from kadensotek/master

Merged changes to get us on same page