Merge pull request #67 from JimHokanson/master

Added script for fixing files
Merge pull request #69 from JimHokanson/master

PEP8 and normalized worm changes
Small changes so code runs

Removed pdb references in WormFeatures
Refactoring features code

- Moved some generic Matlab code into utils
- Removed the generic "feature_helpers"
- Created a dedicated "velocity" module
- Made the import lines more consistent across files, so that the code
is written to have imports starting with 3rd-party imports and then
going to imports of modules within our own code base
Moved features code to /features directory

Also renamed wormpy directory to src
Created a "code progress" spreadsheet
renamed jim_test.py to validate_features.py
renamed michael_test.py to plot_example.py
removed temp_fix_pep8.py
Fixed .gitignore to rename "wormpy" to "src"

Also made a slight revision to the Code Progress document
Small edit to code progress document
Merge remote-tracking branch 'remotes/upstream/master'

I need to do some manual fixes, will commit now then fix

Conflicts:
	src/features/WormFeatures.py
	src/features/feature_comparisons.py
	src/features/locomotion_bends.py
	src/features/locomotion_turns.py
	wormpy/utils.py
Finished merge fixes, fixed edge cases in event comparisons