Initial Commit
Initial successful conversion to OS X
Added back README.
Merge branch 'develop'
Fixed merge issues.